Skip to content

Commit 2945ac8

Browse files
committed
chore(ci): get rid of uraimo/run-on-arch-action in favor of aarch64 runner
We can use ubuntu-22.04-arm to have a native aarch64 runner instead of relying on unmaintained uraimo/run-on-arch-action to launch a qemu-aarch64.
1 parent a8ed27e commit 2945ac8

File tree

1 file changed

+13
-22
lines changed

1 file changed

+13
-22
lines changed

.github/workflows/CI.yml

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ jobs:
138138
name: Build wheels (linux)
139139
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.*.labels.*.name, 'dependencies')
140140
needs: [check_pre_commit]
141-
runs-on: ubuntu-latest
142141
strategy:
143142
fail-fast: false
144143
matrix:
@@ -152,6 +151,7 @@ jobs:
152151
# lief is not available for this platform (and no sdist is provided)
153152
# - manylinux: musllinux_1_1
154153
# target: aarch64
154+
runs-on: ${{ matrix.target == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
155155
steps:
156156
- name: Checkout source code
157157
uses: actions/checkout@v4
@@ -183,24 +183,17 @@ jobs:
183183
python3 -m venv wheel.venv
184184
source wheel.venv/bin/activate
185185
pip install dist/*.whl
186-
unblob --help
186+
unblob --version
187187
188188
- name: Check wheel (cross-manylinux)
189189
if: matrix.platform.target != 'x86_64' && startsWith(matrix.platform.manylinux, 'manylinux')
190-
uses: uraimo/[email protected]
191-
with:
192-
arch: ${{ matrix.platform.target }}
193-
distro: ubuntu22.04
194-
githubToken: ${{ github.token }}
195-
install: |
196-
apt-get update
197-
apt-get install -y --no-install-recommends python3-venv libmagic1
198-
run: |
199-
set -e
200-
python3 -m venv wheel.venv
201-
source wheel.venv/bin/activate
202-
pip install dist/*.whl
203-
unblob --version
190+
shell: bash
191+
run: |
192+
set -e
193+
python3 -m venv wheel.venv
194+
source wheel.venv/bin/activate
195+
pip install dist/*.whl
196+
unblob --version
204197
205198
- name: Check wheel (x86-musllinux)
206199
if: matrix.platform.target == 'x86_64' && startsWith(matrix.platform.manylinux, 'musllinux')
@@ -218,15 +211,13 @@ jobs:
218211
219212
- name: Check wheel (cross-musllinux)
220213
if: matrix.platform.target != 'x86_64' && startsWith(matrix.platform.manylinux, 'musllinux')
221-
uses: uraimo/run-on-arch-action@v3.0.1
214+
uses: addnab/docker-run-action@v3
222215
with:
223-
arch: ${{ matrix.platform.target }}
224-
distro: alpine_latest
225-
githubToken: ${{ github.token }}
226-
install: |
227-
apk add py3-pip libmagic gcc lz4 musl-dev python3-dev
216+
image: alpine:latest
217+
options: -v ${{ github.workspace }}:/io -w /io
228218
run: |
229219
set -e
220+
apk add py3-pip libmagic gcc lz4 musl-dev python3-dev
230221
python3 -m venv wheel.venv
231222
source wheel.venv/bin/activate
232223
pip install dist/*.whl

0 commit comments

Comments
 (0)