Skip to content

Commit 32472a8

Browse files
committed
fix: yet different temporary fix for docker/setup-qemu-action#198
Signed-off-by: deadprogram <[email protected]>
1 parent 177a46f commit 32472a8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/docker.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ concurrency:
1212
jobs:
1313
opencv:
1414
name: opencv
15-
# GCC on qemu segfaults on s390x and arm64v8 when using 24.04
16-
# See also https://github.com/actions/runner-images/issues/11471
17-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1816
permissions:
1917
packages: write
2018
contents: read
@@ -53,6 +51,8 @@ jobs:
5351
run: df . -h
5452
- name: Set up QEMU
5553
uses: docker/setup-qemu-action@v3
54+
with:
55+
image: tonistiigi/binfmt:qemu-v8.1.5
5656
- name: Set up Docker Buildx
5757
uses: docker/setup-buildx-action@v3
5858
- name: Check out the repo
@@ -96,9 +96,7 @@ jobs:
9696

9797
opencv-static:
9898
name: opencv-static
99-
# GCC on qemu segfaults on s390x and arm64v8 when using 24.04
100-
# See also https://github.com/actions/runner-images/issues/11471
101-
runs-on: ubuntu-22.04
99+
runs-on: ubuntu-latest
102100
permissions:
103101
packages: write
104102
contents: read
@@ -137,6 +135,8 @@ jobs:
137135
run: df . -h
138136
- name: Set up QEMU
139137
uses: docker/setup-qemu-action@v3
138+
with:
139+
image: tonistiigi/binfmt:qemu-v8.1.5
140140
- name: Set up Docker Buildx
141141
uses: docker/setup-buildx-action@v3
142142
- name: Check out the repo

0 commit comments

Comments
 (0)