Skip to content

Commit 659e859

Browse files
committed
GitHub workflows: multiarch: use ARM runner for ARM arches
We are observing strange errors with the openSUSE tumbleweed test on arm/v7. Try to use the arm4 runner for that. Signed-off-by: Martin Wilck <mwilck@suse.com>
1 parent 01705b4 commit 659e859

1 file changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/multiarch.yaml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ on:
3030
jobs:
3131

3232
build-current:
33-
runs-on: ubuntu-24.04
3433
strategy:
3534
fail-fast: false
3635
matrix:
@@ -40,14 +39,30 @@ jobs:
4039
- fedora-rawhide
4140
- opensuse-tumbleweed
4241
arch: [ppc64le, s390x, 386, arm/v7]
42+
variant:
43+
- arch: ppc64le
44+
runner: ubuntu-24.04
45+
- arch: s390x
46+
runner: ubuntu-24.04
47+
- arch: 386
48+
runner: ubuntu-24.04
49+
- arch: arm/v7
50+
runner: ubuntu-24.04-arm
4351
exclude:
4452
- os: fedora-rawhide
45-
arch: 386
53+
variant:
54+
arch: 386
55+
runner: ubuntu-24.04
4656
- os: fedora-rawhide
47-
arch: arm/v7
57+
variant:
58+
arch: arm/v7
59+
runner: ubuntu-24.04-arm
4860
include:
4961
- os: alpine
50-
arch: aarch64
62+
variant:
63+
arch: aarch64
64+
runner: ubuntu-24.04-arm
65+
runs-on: ${{ matrix.variant.runner }}
5166
steps:
5267
- name: checkout
5368
uses: actions/checkout@v4
@@ -57,15 +72,15 @@ jobs:
5772
image: tonistiigi/binfmt:latest
5873
- name: set architecture name
5974
run: |
60-
__arch="${{ matrix.arch }}"
75+
__arch="${{ matrix.variant.arch }}"
6176
echo "ARCH_NAME=${__arch//\//-}" >>"$GITHUB_ENV"
6277
- name: Set coredump pattern
6378
run: |
6479
echo 'core.%e.%p' | sudo tee /proc/sys/kernel/core_pattern
6580
- name: compile and run unit tests
6681
id: test
6782
run: |
68-
docker run --pids-limit 4096 --platform linux/${{ matrix.arch }} \
83+
docker run --pids-limit 4096 --platform linux/${{ matrix.variant.arch }} \
6984
-w /build -v${{ github.workspace }}:/build \
7085
ghcr.io/mwilck/multipath-build-${{ matrix.os }} test
7186
continue-on-error: true
@@ -75,7 +90,7 @@ jobs:
7590
if: steps.test.outcome != 'success'
7691
- name: create archives
7792
run: |
78-
docker run --platform linux/${{ matrix.arch }} \
93+
docker run --platform linux/${{ matrix.variant.arch }} \
7994
-w /build -v${{ github.workspace }}:/build \
8095
ghcr.io/mwilck/multipath-build-${{ matrix.os }} test-progs.tar test-outputs.tar
8196
if: steps.test.outcome != 'success'

0 commit comments

Comments
 (0)