Skip to content

Commit b83a2bb

Browse files
committed
refactor: use new download artifact in docker workflow
1 parent b69b6a1 commit b83a2bb

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.github/workflows/docker.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,19 @@ jobs:
3535
username: ${{ secrets.DOCKER_USERNAME }}
3636
password: ${{ secrets.DOCKER_PASSWORD }}
3737

38+
- name: Get version branch
39+
id: version-branch
40+
run: echo "::set-output name=name::v$(jq .version package.json)"
41+
42+
- name: Download artifact
43+
uses: dawidd6/action-download-artifact@v2
44+
id: download
45+
with:
46+
branch: v${{ steps.version-branch.outputs.name }}
47+
workflow_conclusion: completed
48+
name: "release-packages"
49+
path: release-packages
50+
3851
- name: Run ./ci/steps/docker-buildx-push.sh
3952
run: ./ci/steps/docker-buildx-push.sh
4053
env:

ci/steps/docker-buildx-push.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ set -euo pipefail
44
main() {
55
cd "$(dirname "$0")/../.."
66

7-
# ci/lib.sh sets VERSION and provides download_artifact here
8-
source ./ci/lib.sh
9-
10-
# Download the release-packages artifact
11-
download_artifact release-packages ./release-packages
12-
7+
# NOTE@jsjoeio - this script assumes that you've downloaded
8+
# the release-packages artifact to ./release-packages before
9+
# running this docker buildx step
1310
docker buildx bake -f ci/release-image/docker-bake.hcl --push
1411
}
1512

0 commit comments

Comments
 (0)