Skip to content

Commit 30ca28a

Browse files
committed
Remove pinned buildkit version, add matrix.platform as an artifact path component and bump upload/download-artifact actions
1 parent 96406d9 commit 30ca28a

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

.github/workflows/build-push.yaml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ jobs:
5555
username: ${{ github.actor }}
5656
password: ${{ secrets.GITHUB_TOKEN }}
5757
- uses: docker/setup-buildx-action@v3
58-
with:
59-
driver-opts: |
60-
image=moby/buildkit:v0.19.0
6158
- uses: docker/build-push-action@v6
6259
name: Build
6360
id: build
@@ -77,20 +74,20 @@ jobs:
7774
- name: Export digest
7875
if: github.ref == 'refs/heads/main'
7976
run: |
80-
mkdir -p /tmp/digests/${{ matrix.version }}-${{ matrix.image }}
77+
mkdir -p /tmp/digests/${{ matrix.version }}-${{ matrix.image }}-${{ matrix.platform }}
8178
digest="${{ steps.build.outputs.digest }}"
82-
touch "/tmp/digests/${{ matrix.version }}-${{ matrix.image }}/${digest#sha256:}"
79+
touch "/tmp/digests/${{ matrix.version }}-${{ matrix.image }}-${{ matrix.platform }}/${digest#sha256:}"
8380
- name: Upload digest
8481
if: github.ref == 'refs/heads/main'
85-
uses: actions/upload-artifact@v3
82+
uses: actions/upload-artifact@v4
8683
with:
87-
name: digests-${{ matrix.version }}-${{ matrix.image }}
88-
path: /tmp/digests/${{ matrix.version }}-${{ matrix.image }}/*
84+
name: digests-${{ matrix.version }}-${{ matrix.image }}-${{ matrix.platform }}
85+
path: /tmp/digests/${{ matrix.version }}-${{ matrix.image }}-${{ matrix.platform }}/*
8986
if-no-files-found: error
9087
retention-days: 1
9188

9289
merge-manifests:
93-
needs: ["build-test-push", "gather-versions"]
90+
needs: ["build-test-push"]
9491
if: github.ref == 'refs/heads/main'
9592
runs-on: ubuntu-24.04
9693
strategy:
@@ -105,14 +102,11 @@ jobs:
105102
username: ${{ github.actor }}
106103
password: ${{ secrets.GITHUB_TOKEN }}
107104
- uses: docker/setup-buildx-action@v3
108-
with:
109-
driver-opts: |
110-
image=moby/buildkit:v0.19.0
111105
- name: Download digests
112-
uses: actions/download-artifact@v3
106+
uses: actions/download-artifact@v4
113107
with:
114108
name: digests-${{ matrix.version }}-${{ matrix.image }}
115-
path: /tmp/digests/${{ matrix.version }}-${{ matrix.image }}
109+
pattern: /tmp/digests/${{ matrix.version }}-${{ matrix.image }}-*
116110
- name: Create and push manifest
117111
working-directory: /tmp/digests/${{ matrix.version }}-${{ matrix.image }}
118112
run: |

0 commit comments

Comments
 (0)