Skip to content

Commit 2748b91

Browse files
authored
Merge pull request #8819 from radarhere/qemu
Use docker/setup-qemu-action
2 parents 004bb0e + 7767e83 commit 2748b91

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/test-docker.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
matrix:
3636
os: ["ubuntu-latest"]
3737
docker: [
38+
# Run slower jobs first to give them a headstart and reduce waiting time
39+
ubuntu-24.04-noble-ppc64le,
40+
ubuntu-24.04-noble-s390x,
41+
# Then run the remainder
3842
alpine,
3943
amazon-2-amd64,
4044
amazon-2023-amd64,
@@ -52,13 +56,9 @@ jobs:
5256
dockerTag: [main]
5357
include:
5458
- docker: "ubuntu-24.04-noble-ppc64le"
55-
os: "ubuntu-22.04"
5659
qemu-arch: "ppc64le"
57-
dockerTag: main
5860
- docker: "ubuntu-24.04-noble-s390x"
59-
os: "ubuntu-22.04"
6061
qemu-arch: "s390x"
61-
dockerTag: main
6262
- docker: "ubuntu-24.04-noble-arm64v8"
6363
os: "ubuntu-24.04-arm"
6464
dockerTag: main
@@ -75,8 +75,9 @@ jobs:
7575

7676
- name: Set up QEMU
7777
if: "matrix.qemu-arch"
78-
run: |
79-
docker run --rm --privileged aptman/qus -s -- -p ${{ matrix.qemu-arch }}
78+
uses: docker/setup-qemu-action@v3
79+
with:
80+
platforms: ${{ matrix.qemu-arch }}
8081

8182
- name: Docker pull
8283
run: |

0 commit comments

Comments
 (0)