Drone scripts: Trim newlines in GPG keys (#131)

grafana · Aug 24, 2023 · bd41534 · bd41534
1 parent cc1959a
commit bd41534
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/drone_publish_tag_enterprise.sh b/scripts/drone_publish_tag_enterprise.sh
@@ -44,8 +44,8 @@ dagger run go run ./cmd rpm \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} \
   --sign=true \
-  --gpg-private-key-base64=$(echo ${GPG_PRIVATE_KEY} | base64 -w 0) \
-  --gpg-public-key-base64=$(echo ${GPG_PUBLIC_KEY} | base64 -w 0) \
+  --gpg-private-key-base64=$(echo ${GPG_PRIVATE_KEY} | tr -d '\n') \
+  --gpg-public-key-base64=$(echo ${GPG_PUBLIC_KEY} | tr -d '\n') \
   --gpg-passphrase-base64=$(echo $GPG_PASSPHRASE | base64 -w 0) > rpms.txt
 
 # For Windows we distribute zips and exes

diff --git a/scripts/drone_publish_tag_grafana.sh b/scripts/drone_publish_tag_grafana.sh
@@ -51,8 +51,8 @@ dagger run --silent go run ./cmd rpm \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} \
   --sign=true \
-  --gpg-private-key-base64=$(echo ${GPG_PRIVATE_KEY} | base64 -w 0) \
-  --gpg-public-key-base64=$(echo ${GPG_PUBLIC_KEY} | base64 -w 0) \
+  --gpg-private-key-base64=$(echo ${GPG_PRIVATE_KEY} | tr -d '\n') \
+  --gpg-public-key-base64=$(echo ${GPG_PUBLIC_KEY} | tr -d '\n') \
   --gpg-passphrase-base64=$(echo ${GPG_PASSPHRASE} | base64 -w 0) > rpms.txt
 
 # For Windows we distribute zips and exes