From 0059081bdc7a11c40c020ffe587105bcd54d0949 Mon Sep 17 00:00:00 2001
From: Akosh Farkash <akosh.farkash@iohk.io>
Date: Tue, 13 Apr 2021 15:48:36 +0100
Subject: [PATCH 1/2] ETCM-165: Move the gpg step, maybe that's the problem
 with 'no pinentry'

---
 .buildkite/pipeline.nix | 2 +-
 .buildkite/publish.sh   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.nix b/.buildkite/pipeline.nix
index 06a2084f5f..200f9763fe 100644
--- a/.buildkite/pipeline.nix
+++ b/.buildkite/pipeline.nix
@@ -160,7 +160,7 @@ in
       command = ''
         nix-env -iA nixpkgs.gnupg && nix-shell --run '.buildkite/publish.sh'
       '';
-      branches = "master develop";
+      branches = "master develop ETCM-165-fix-publish";
       timeoutInMinutes = 30;
     };
   };
diff --git a/.buildkite/publish.sh b/.buildkite/publish.sh
index ac357a1222..80910dbb76 100755
--- a/.buildkite/publish.sh
+++ b/.buildkite/publish.sh
@@ -18,9 +18,9 @@ GPG_EXISTS=$(gpg --list-keys "$GPG_KEY_ID" >&2 && echo "yes" || echo "no")
 
 if [[ "$GPG_EXISTS" == "no" ]]; then
 	echo "$GPG_KEY" | base64 --decode | gpg --batch --import
+    # Local testing showed that without this the SBT plugin got "Bad passphrase".
+    gpg --passphrase $GPG_PASSPHRASE --batch --yes -a -b LICENSE
 fi
-# Local testing showed that without this the SBT plugin got "Bad passphrase".
-gpg --passphrase $GPG_PASSPHRASE --batch --yes -a -b LICENSE
 
 # https://github.com/olafurpg/sbt-ci-release#secrets
 export PGP_SECRET="$GPG_KEY"
@@ -58,7 +58,7 @@ function releaseAll {
     release 2.13.4 1.4.7
 }
 
-if [[ "$BUILDKITE_BRANCH" == "develop" ]]; then
+if [[ "$BUILDKITE_BRANCH" == "develop" ]] || [[ "$BUILDKITE_BRANCH" == "ETCM-165-fix-publish" ]]; then
 
     # Publish the -SNAPSHOT version.
     releaseAll

From 9e1199ce767300eab6ff412fb00bb7a3b33f85ef Mon Sep 17 00:00:00 2001
From: Akosh Farkash <akosh.farkash@iohk.io>
Date: Tue, 13 Apr 2021 16:19:43 +0100
Subject: [PATCH 2/2] ETCM-165: Remove publishing on PR branch.

---
 .buildkite/pipeline.nix | 2 +-
 .buildkite/publish.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.nix b/.buildkite/pipeline.nix
index 200f9763fe..06a2084f5f 100644
--- a/.buildkite/pipeline.nix
+++ b/.buildkite/pipeline.nix
@@ -160,7 +160,7 @@ in
       command = ''
         nix-env -iA nixpkgs.gnupg && nix-shell --run '.buildkite/publish.sh'
       '';
-      branches = "master develop ETCM-165-fix-publish";
+      branches = "master develop";
       timeoutInMinutes = 30;
     };
   };
diff --git a/.buildkite/publish.sh b/.buildkite/publish.sh
index 80910dbb76..41d2311b16 100755
--- a/.buildkite/publish.sh
+++ b/.buildkite/publish.sh
@@ -58,7 +58,7 @@ function releaseAll {
     release 2.13.4 1.4.7
 }
 
-if [[ "$BUILDKITE_BRANCH" == "develop" ]] || [[ "$BUILDKITE_BRANCH" == "ETCM-165-fix-publish" ]]; then
+if [[ "$BUILDKITE_BRANCH" == "develop" ]]; then
 
     # Publish the -SNAPSHOT version.
     releaseAll