Skip to content

Commit 14d5024

Browse files
authored
Use native arm64 runners (mitmproxy#217)
1 parent 8e09914 commit 14d5024

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ runs:
1313
using: "composite"
1414
steps:
1515
- uses: mhils/workflows/setup-python@v15 # PyO3 wants recent Python on Windows.
16+
- run: which rustup || sudo DEBIAN_FRONTEND=noninteractive apt-get -y install rustup # https://github.com/actions/partner-runner-images/issues/26
17+
shell: bash
1618
- run: rustup toolchain install ${{ inputs.rust-version }} --profile minimal ${{ inputs.toolchain-args }}
1719
shell: bash
1820
- run: rustup default ${{ inputs.rust-version }}

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ jobs:
7575
os: ubuntu-latest
7676
args: --compatibility manylinux2014 --zig --sdist
7777
- name: linux-arm64
78-
os: ubuntu-latest
79-
target: aarch64-unknown-linux-gnu
80-
args: --compatibility manylinux2014 --zig --target aarch64-unknown-linux-gnu -i 3.12
78+
os: ubuntu-24.04-arm
79+
args: --compatibility manylinux2014 --zig
8180
- name: macos-universal
8281
os: macos-latest
8382
target: aarch64-apple-darwin x86_64-apple-darwin
@@ -186,27 +185,28 @@ jobs:
186185
matrix:
187186
include:
188187
- name: linux-x86_64
188+
os: ubuntu-latest
189189
args: --compatibility manylinux2014 --zig --sdist
190190
- name: linux-arm64
191-
target: aarch64-unknown-linux-gnu
192-
args: --compatibility manylinux2014 --zig --target aarch64-unknown-linux-gnu -i 3.12
191+
os: ubuntu-24.04-arm
192+
args: --compatibility manylinux2014 --zig
193193
# FIXME: extra wheels because of https://github.com/PyO3/maturin/issues/2423
194194
- name: linux-x86_64-py3.13
195+
os: ubuntu-latest
195196
args: --compatibility manylinux2014 --zig -i 3.13
196197
- name: linux-arm64-py3.13
197-
target: aarch64-unknown-linux-gnu
198-
args: --compatibility manylinux2014 --zig --target aarch64-unknown-linux-gnu -i 3.13
199-
runs-on: ubuntu-latest
198+
os: ubuntu-24.04-arm
199+
args: --compatibility manylinux2014 --zig -i 3.13
200+
runs-on: ${{ matrix.os }}
200201
steps:
201202
- uses: mhils/workflows/checkout@v15
202203
- uses: ./.github/actions/setup
203-
with:
204-
extra-targets: ${{ matrix.target }}
205204
- name: Install maturin[zig] from PyPI
206205
uses: install-pinned/maturin-with-zig@68c027568b7d08df7bc3c52476ae28d1d2d787f5
207-
208206
- run: maturin build --release ${{ matrix.args }}
209207
working-directory: ./mitmproxy-linux
208+
env:
209+
XDG_CONFIG_HOME: ~/.config # https://github.com/actions/partner-runner-images/issues/27
210210

211211
- uses: actions/upload-artifact@v4
212212
with:

0 commit comments

Comments
 (0)