Skip to content

Commit fb85154

Browse files
committed
GHA: Use Linux ARM runners for build and test
1 parent f4a6ff2 commit fb85154

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.cibw/setup-build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def pp3(y_min=7, y_max=10):
6161

6262
GHA_RUNNER = {
6363
"Linux": {
64-
"aarch64": "ubuntu-latest",
64+
"aarch64": "ubuntu-24.04-arm",
6565
"ppc64le": "ubuntu-latest",
6666
"x86_64": "ubuntu-latest",
6767
None: "ubuntu-latest"

.cibw/setup-test.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,15 @@
9090
assert match is not None
9191
std, mpi, py, x, y, ostag, archtag = match.groups()
9292
osname, mpiabi, x, y = osmap[ostag], f"{std}-{mpi}", int(x), int(y)
93-
for arch in ("x86_64", "AMD64", "arm64"):
93+
for arch in ("x86_64", "AMD64", "arm64", "aarch64"):
9494
if arch.lower() in archtag.lower():
9595
builds.append((osname, arch, mpiabi, py, (x, y)))
9696
builds = sorted(builds, key=lambda r: (r[0].lower(), *r[1:]))
9797

9898

9999
runners = {
100-
"Linux-x86_64": "ubuntu-22.04",
100+
"Linux-aarch64": "ubuntu-24.04-arm",
101+
"Linux-x86_64": "ubuntu-24.04",
101102
"macOS-arm64": "macos-14",
102103
"macOS-x86_64": "macos-13",
103104
"Windows-AMD64": "windows-2022",
@@ -130,9 +131,13 @@
130131

131132

132133
runners = {
134+
"Linux-aarch64": [
135+
"ubuntu-22.04-arm",
136+
"ubuntu-24.04-arm",
137+
],
133138
"Linux-x86_64": [
134-
"ubuntu-20.04",
135139
"ubuntu-22.04",
140+
"ubuntu-24.04",
136141
],
137142
"macOS-arm64": [
138143
"macos-14",

.github/workflows/cd-wheel.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
working-directory: mpi4py.git
131131

132132
- id: setup-qemu
133-
if: ${{ runner.os == 'Linux' }}
133+
if: ${{ runner.os == 'Linux' && matrix.arch == 'ppc64le' }}
134134
uses: docker/setup-qemu-action@v3
135135
with:
136136
platforms: all
@@ -265,6 +265,13 @@ jobs:
265265
matrix-test-gh: ${{ steps.setup.outputs.matrix-test-gh }}
266266
steps:
267267
- uses: actions/checkout@v4
268+
- if: ${{ contains(needs.setup.outputs.os-arch-list, '"Linux-aarch64"') }}
269+
uses: actions/download-artifact@v4
270+
with:
271+
path: wheelhouse
272+
pattern: build-Linux-aarch64-*
273+
merge-multiple: true
274+
- uses: actions/checkout@v4
268275
- if: ${{ contains(needs.setup.outputs.os-arch-list, '"Linux-x86_64"') }}
269276
uses: actions/download-artifact@v4
270277
with:

0 commit comments

Comments
 (0)