Skip to content

Commit 9005319

Browse files
authored
Merge pull request #290 from crazy-max/update-github-builder
ci: update docker github builder to latest
2 parents 49eb232 + 7065e7a commit 9005319

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.github/workflows/.build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
core.setOutput('git_tag', gitTag);
105105
106106
image:
107-
uses: docker/github-builder-experimental/.github/workflows/bake.yml@478a43dbc00a94706d6f106551b49c665c99b64c
107+
uses: docker/github-builder-experimental/.github/workflows/bake.yml@7256a7a404fc511cf9e7b699a9d9d5ec76e8639e
108108
needs:
109109
- prepare-build
110110
permissions:
@@ -116,9 +116,9 @@ jobs:
116116
target: ${{ inputs.target }}-all
117117
output: image
118118
push: ${{ ! inputs.dry-run }}
119-
set: |
120-
*.args.QEMU_REPO=${{ needs.prepare-build.outputs.qemu_repo }}
121-
*.args.QEMU_VERSION=${{ needs.prepare-build.outputs.qemu_version }}
119+
vars: |
120+
QEMU_REPO=${{ needs.prepare-build.outputs.qemu_repo }}
121+
QEMU_VERSION=${{ needs.prepare-build.outputs.qemu_version }}
122122
set-meta-annotations: true
123123
meta-images: |
124124
${{ needs.prepare-build.outputs.image_name }}
@@ -142,9 +142,10 @@ jobs:
142142
- registry: docker.io
143143
username: ${{ secrets.DOCKERIO_USERNAME }}
144144
password: ${{ secrets.DOCKERIO_PASSWORD }}
145+
scope: ${{ needs.prepare-build.outputs.image_name }}@push
145146
146147
qemu-archive:
147-
uses: docker/github-builder-experimental/.github/workflows/bake.yml@478a43dbc00a94706d6f106551b49c665c99b64c
148+
uses: docker/github-builder-experimental/.github/workflows/bake.yml@7256a7a404fc511cf9e7b699a9d9d5ec76e8639e
148149
if: inputs.target == 'mainline'
149150
permissions:
150151
contents: read # same as global permission
@@ -199,7 +200,7 @@ jobs:
199200
if-no-files-found: error
200201

201202
binfmt-archive:
202-
uses: docker/github-builder-experimental/.github/workflows/bake.yml@478a43dbc00a94706d6f106551b49c665c99b64c
203+
uses: docker/github-builder-experimental/.github/workflows/bake.yml@7256a7a404fc511cf9e7b699a9d9d5ec76e8639e
203204
if: inputs.target == 'mainline'
204205
permissions:
205206
contents: read # same as global permission

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ jobs:
123123
docker run --rm --platform linux/s390x alpine uname -a
124124
docker run --rm --platform linux/riscv64 alpine uname -a
125125
docker run --rm --platform linux/loong64 registry.alpinelinux.org/img/alpine uname -a
126-
docker run --rm --platform linux/s390x ubuntu apt update
127-
docker run --rm --platform linux/ppc64le ubuntu apt update
128-
docker run --rm --platform linux/arm64 ubuntu apt update
126+
docker run --rm --platform linux/s390x ubuntu apt-get update
127+
docker run --rm --platform linux/ppc64le ubuntu apt-get update
128+
docker run --rm --platform linux/arm64 ubuntu apt-get update
129129
-
130130
name: Test Syscalls
131131
if: matrix.target == 'mainline'

0 commit comments

Comments
 (0)