Skip to content

Commit 047b27f

Browse files
committed
GitHub workflows: run arm64 tests on native runner
GitHub provides arm64 runners now [1]. Use them. The workflows don't seem to run faster than before, but the tests should be more realistic. [1] https://github.blog/changelog/2025-01-16-linux-arm64-hosted-runners-now-available-for-free-in-public-repositories-public-preview/ Signed-off-by: Martin Wilck <mwilck@suse.com> (cherry picked from commit 00cdcbc)
1 parent f50d96b commit 047b27f

4 files changed

Lines changed: 40 additions & 13 deletions

File tree

.github/workflows/multiarch-stable.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ jobs:
3737
- ubuntu-trusty
3838
arch: [386, arm/v7]
3939
include:
40-
- os: debian-trixie
41-
arch: aarch64
4240
- os: debian-trixie
4341
arch: s390x
4442
- os: debian-trixie
4543
arch: ppc64le
46-
- os: debian-bookworm
47-
arch: aarch64
4844
- os: debian-bookworm
4945
arch: s390x
5046
- os: debian-bookworm

.github/workflows/multiarch.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ jobs:
3939
- debian-sid
4040
- fedora-rawhide
4141
- opensuse-tumbleweed
42-
arch: [amd64, ppc64le, aarch64, s390x, 386, arm/v7]
42+
arch: [ppc64le, s390x, 386, arm/v7]
4343
exclude:
4444
- os: fedora-rawhide
4545
arch: 386
4646
- os: fedora-rawhide
4747
arch: arm/v7
48+
include:
49+
- os: alpine
50+
arch: aarch64
4851
steps:
4952
- name: checkout
5053
uses: actions/checkout@v4

.github/workflows/native.yaml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ on:
2626

2727
jobs:
2828
stable:
29-
runs-on: ubuntu-24.04
3029
strategy:
3130
fail-fast: false
3231
matrix:
@@ -39,6 +38,12 @@ jobs:
3938
- fedora-43
4039
- opensuse-leap-15.6
4140
- opensuse-leap-16.0
41+
variant:
42+
- arch: x86_64
43+
runner: ubuntu-24.04
44+
- arch: aarch64
45+
runner: ubuntu-24.04-arm
46+
runs-on: ${{ matrix.variant.runner }}
4247
steps:
4348
- name: checkout
4449
uses: actions/checkout@v4
@@ -81,24 +86,33 @@ jobs:
8186
- name: upload binary archive
8287
uses: actions/upload-artifact@v4
8388
with:
84-
name: native-${{ matrix.os }}
89+
name: native-${{ matrix.os }}-${{ matrix.variant.arch }}
8590
path: ${{ env.ARCHIVE_TGT }}
8691
overwrite: true
8792

8893
clang:
89-
runs-on: ubuntu-24.04
9094
strategy:
9195
fail-fast: false
9296
matrix:
9397
os:
94-
- debian-jessie
9598
- debian-buster
9699
- debian-bullseye
97100
- debian-bookworm
98101
- debian-trixie
99102
- fedora-43
100103
- opensuse-leap-15.6
101104
- opensuse-leap-16.0
105+
variant:
106+
- arch: x86_64
107+
runner: ubuntu-24.04
108+
- arch: aarch64
109+
runner: ubuntu-24.04-arm
110+
include:
111+
- os: debian-jessie
112+
variant:
113+
arch: x86_64
114+
runner: ubuntu-24.04
115+
runs-on: ${{ matrix.variant.runner }}
102116
steps:
103117
- name: checkout
104118
uses: actions/checkout@v4
@@ -119,7 +133,6 @@ jobs:
119133
command: -j -Orecurse READLINE=libreadline test
120134

121135
root-test:
122-
runs-on: ubuntu-24.04
123136
needs: stable
124137
strategy:
125138
fail-fast: false
@@ -133,6 +146,12 @@ jobs:
133146
- fedora-43
134147
- opensuse-leap-15.6
135148
- opensuse-leap-16.0
149+
variant:
150+
- arch: x86_64
151+
runner: ubuntu-24.04
152+
- arch: aarch64
153+
runner: ubuntu-24.04-arm
154+
runs-on: ${{ matrix.variant.runner }}
136155
steps:
137156
- name: mpath
138157
run: sudo modprobe dm_multipath
@@ -145,7 +164,7 @@ jobs:
145164
- name: download binary archive
146165
uses: actions/download-artifact@v4
147166
with:
148-
name: native-${{ matrix.os }}
167+
name: native-${{ matrix.os }}-${{ matrix.variant.arch }}
149168
- name: unpack binary archive
150169
run: cpio -idv < test-progs.cpio
151170
if: ${{ startswith(matrix.os, 'opensuse-leap-15') }}

.github/workflows/rolling.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,24 @@ on:
2929

3030
jobs:
3131
rolling:
32-
runs-on: ubuntu-24.04
3332
strategy:
3433
fail-fast: false
3534
matrix:
3635
os:
3736
- debian-sid
38-
- alpine
3937
- opensuse-tumbleweed
4038
- fedora-rawhide
39+
variant:
40+
- arch: x86_64
41+
runner: ubuntu-24.04
42+
- arch: aarch64
43+
runner: ubuntu-24.04-arm
44+
include:
45+
- os: alpine
46+
variant:
47+
arch: x86_64
48+
runner: ubuntu-24.04
49+
runs-on: ${{ matrix.variant.runner }}
4150
container: ghcr.io/mwilck/multipath-build-${{ matrix.os }}
4251
steps:
4352
- name: checkout

0 commit comments

Comments
 (0)