fix

elastic · Jun 4, 2024 · d0a4c1b · d0a4c1b
1 parent bc7c437
commit d0a4c1b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.buildkite/release.yml b/.buildkite/release.yml
@@ -38,12 +38,12 @@ steps:
 
   - label: Download signed artifacts
     commands:
-      - .buildkite/scripts/download-signed-artifacts.sh "gpg-sign-service"
-      - .buildkite/scripts/download-signed-artifacts.sh "macos-sign-service"
-      - .buildkite/scripts/download-signed-artifacts.sh "windows-sign-service"
-      - .buildkite/scripts/download-signed-artifacts.sh "gpg-sign-service" | buildkite-agent pipeline upload
-      - .buildkite/scripts/download-signed-artifacts.sh "macos-sign-service" | buildkite-agent pipeline upload
-      - .buildkite/scripts/download-signed-artifacts.sh "windows-sign-service" | buildkite-agent pipeline upload
+      - .buildkite/scripts/download-signed-artifacts.sh "gpg-sign-service" "gpg"
+      - .buildkite/scripts/download-signed-artifacts.sh "macos-sign-service" "macos"
+      - .buildkite/scripts/download-signed-artifacts.sh "windows-sign-service" "windows"
+      - .buildkite/scripts/download-signed-artifacts.sh "gpg-sign-service" "gpg" | buildkite-agent pipeline upload
+      - .buildkite/scripts/download-signed-artifacts.sh "macos-sign-service" "macos" | buildkite-agent pipeline upload
+      - .buildkite/scripts/download-signed-artifacts.sh "windows-sign-service" "windows" | buildkite-agent pipeline upload
 
   - wait: ~
 
@@ -61,9 +61,9 @@ steps:
     commands:
       - .buildkite/scripts/create-github-release.sh
     depends_on:
-      - "gpg-sign-service"
-      - "macos-sign-service"
-      - "windows-sign-service"
+      - "gpg"
+      - "macos"
+      - "windows"
 
 # Figure out how to notify releases (maybe subscribe the slack channel to the GitHub releases?)
 notify:

diff --git a/.buildkite/scripts/create-github-release.sh b/.buildkite/scripts/create-github-release.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash#
+#!/usr/bin/env bash
 # Download the signed artifacts and run the GitHub release using the GH cli
 #
 # Required environment variables:

diff --git a/.buildkite/scripts/download-signed-artifacts.sh b/.buildkite/scripts/download-signed-artifacts.sh
@@ -7,6 +7,7 @@
 #
 
 STEP=$1
+DOWNLOAD_STEP_NAME=$2
 
 ## Support main pipeline and downstream pipelines
 if [ -n "$BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG" ] ; then
@@ -35,7 +36,7 @@ fi
 
 cat << EOF
   - label: ":pipeline: Download signed artifacts"
-    key: "$STEP"
+    key: "$DOWNLOAD_STEP_NAME"
     commands:
       - mkdir -p signed-artifacts
       - buildkite-agent artifact download --build "$SIGN_BUILD_ID" "*.*" signed-artifacts/