Skip to content

Commit a29298b

Browse files
authored
Fix artifacts retrieval in release pipeline (#5026)
### Changes - Use `last` in jq pipeline to select only the last main build when looking for artifact on release pipeline ### Issues #4991
2 parents 09e61e1 + 4e89ba1 commit a29298b

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

scripts/buildkite/release/push-artifacts.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euox pipefail
44

5-
base_build=$(buildkite-agent meta-data get base-build)
5+
TRIGGERED_BY=$(buildkite-agent meta-data get base-build)
66
NEW_GIT_TAG=$(buildkite-agent meta-data get release-version)
77
TEST_RC=$(buildkite-agent meta-data get test-rc)
88

@@ -16,10 +16,12 @@ else
1616
TAG=$NEW_GIT_TAG
1717
fi
1818

19-
main_build=$(curl -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
20-
-X GET "https://api.buildkite.com/v2/builds" \
21-
| jq ".[] | select(.meta_data.\"triggered-by\" == \"$base_build\")" \
22-
| jq .number)
19+
select_last_build="last(.[] | select(.meta_data.\"triggered-by\" == \"$TRIGGERED_BY\") | .number)"
20+
21+
main_build=$(curl -s -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
22+
-X GET "https://api.buildkite.com/v2/builds" \
23+
| jq "$select_last_build"
24+
)
2325

2426
mkdir -p artifacts
2527

scripts/buildkite/release/push-to-dockerhub.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ else
1717
TAG=$NEW_GIT_TAG
1818
fi
1919

20-
main_build=$(curl -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
21-
-X GET "https://api.buildkite.com/v2/builds" \
22-
| jq ".[] | select(.meta_data.\"triggered-by\" == \"$TRIGGERED_BY\")" \
23-
| jq .number)
20+
select_last_build="last(.[] | select(.meta_data.\"triggered-by\" == \"$TRIGGERED_BY\") | .number)"
2421

22+
main_build=$(curl -s -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
23+
-X GET "https://api.buildkite.com/v2/builds" \
24+
| jq "$select_last_build"
25+
)
26+
2527
mkdir -p artifacts
2628

2729
repo="cardanofoundation/cardano-wallet"

0 commit comments

Comments
 (0)