From 14d50242ac021c3270e5e4f5b014a3c58ce5cfa9 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 16 Jan 2025 21:06:56 +0100
Subject: [PATCH] Use native arm64 runners (#217)

---
 .github/actions/setup/action.yml |  2 ++
 .github/workflows/ci.yml         | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 94d2dd2d..ede7688d 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -13,6 +13,8 @@ runs:
   using: "composite"
   steps:
     - uses: mhils/workflows/setup-python@v15  # PyO3 wants recent Python on Windows.
+    - run: which rustup || sudo DEBIAN_FRONTEND=noninteractive apt-get -y install rustup  # https://github.com/actions/partner-runner-images/issues/26
+      shell: bash
     - run: rustup toolchain install ${{ inputs.rust-version }} --profile minimal ${{ inputs.toolchain-args }}
       shell: bash
     - run: rustup default ${{ inputs.rust-version }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27a273eb..76f242e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,9 +75,8 @@ jobs:
             os: ubuntu-latest
             args: --compatibility manylinux2014 --zig --sdist
           - name: linux-arm64
-            os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            args: --compatibility manylinux2014 --zig --target aarch64-unknown-linux-gnu -i 3.12
+            os: ubuntu-24.04-arm
+            args: --compatibility manylinux2014 --zig
           - name: macos-universal
             os: macos-latest
             target: aarch64-apple-darwin x86_64-apple-darwin
@@ -186,27 +185,28 @@ jobs:
       matrix:
         include:
           - name: linux-x86_64
+            os: ubuntu-latest
             args: --compatibility manylinux2014 --zig --sdist
           - name: linux-arm64
-            target: aarch64-unknown-linux-gnu
-            args: --compatibility manylinux2014 --zig --target aarch64-unknown-linux-gnu -i 3.12
+            os: ubuntu-24.04-arm
+            args: --compatibility manylinux2014 --zig
           # FIXME: extra wheels because of https://github.com/PyO3/maturin/issues/2423
           - name: linux-x86_64-py3.13
+            os: ubuntu-latest
             args: --compatibility manylinux2014 --zig -i 3.13
           - name: linux-arm64-py3.13
-            target: aarch64-unknown-linux-gnu
-            args: --compatibility manylinux2014 --zig --target aarch64-unknown-linux-gnu -i 3.13
-    runs-on: ubuntu-latest
+            os: ubuntu-24.04-arm
+            args: --compatibility manylinux2014 --zig -i 3.13
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: mhils/workflows/checkout@v15
       - uses: ./.github/actions/setup
-        with:
-          extra-targets: ${{ matrix.target }}
       - name: Install maturin[zig] from PyPI
         uses: install-pinned/maturin-with-zig@68c027568b7d08df7bc3c52476ae28d1d2d787f5
-
       - run: maturin build --release ${{ matrix.args }}
         working-directory: ./mitmproxy-linux
+        env:
+          XDG_CONFIG_HOME: ~/.config  # https://github.com/actions/partner-runner-images/issues/27
 
       - uses: actions/upload-artifact@v4
         with: