From f7cb8279440325e776a1ac75552f25521df48a7c Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 20 Jun 2018 19:01:15 +0200 Subject: [PATCH 1/2] build: fix signing of multiple rpm packages (cherry picked from commit e617e23927d24a851cfbc804d5e714adeffa14e2) --- scripts/build/sign_packages.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build/sign_packages.sh b/scripts/build/sign_packages.sh index a936e68e3b1..c53c2f70ca3 100755 --- a/scripts/build/sign_packages.sh +++ b/scripts/build/sign_packages.sh @@ -6,4 +6,7 @@ gpg --allow-secret-key-import --import ~/private-repo/signing/private.key cp ./scripts/build/rpmmacros ~/.rpmmacros -./scripts/build/sign_expect $GPG_KEY_PASSWORD dist/*.rpm +for package in dist/*.rpm; do + [ -e "$package" ] || continue + ./scripts/build/sign_expect $GPG_KEY_PASSWORD $package +done From e5836064cecfe2adb49b6378f44534a52067ccda Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 21 Jun 2018 10:54:24 +0200 Subject: [PATCH 2/2] release v5.2.0-beta3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2832fef90a..d41b6e1683e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Grafana Labs" }, "name": "grafana", - "version": "5.2.0-beta2", + "version": "5.2.0-beta3", "repository": { "type": "git", "url": "http://github.com/grafana/grafana.git"