From 9ea56ebb5f672cee143d831e8707f9910473914c Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Wed, 30 Apr 2025 10:54:47 +0100
Subject: [PATCH 1/2] Switched to native M1 machines

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81c22d94..06c032fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
+          - macos-15
           - ubuntu-20.04
           - windows-latest
         host:
@@ -33,7 +33,7 @@ jobs:
             node: 18
             host: x86
             target: x86
-          - os: macos-m1
+          - os: macos-15
             node: 18
             host: arm64
             target: arm64
@@ -46,11 +46,11 @@ jobs:
           architecture: ${{ matrix.host }}
 
       - name: Add yarn (self-hosted)
-        if: matrix.os == 'macos-m1'
+        if: matrix.os == 'macos-15'
         run: npm install -g yarn
 
       - name: Add setuptools for Python 3.12 (temp)
-        if: matrix.os != 'macos-m1'
+        if: matrix.os != 'macos-15'
         run: pip install setuptools
 
       - name: Add msbuild to PATH

From 7fcccf88821840536b74e633b1f173e29903b38e Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Wed, 30 Apr 2025 10:59:31 +0100
Subject: [PATCH 2/2] Updated CI runners

---
 .github/workflows/ci.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06c032fe..1e5c18fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
       matrix:
         os:
           - macos-15
-          - ubuntu-20.04
-          - windows-latest
+          - ubuntu-24.04
+          - windows-2025
         host:
           - x64
         target:
@@ -29,7 +29,7 @@ jobs:
         node:
           - 18
         include:
-          - os: windows-latest
+          - os: windows-2025
             node: 18
             host: x86
             target: x86
@@ -37,6 +37,10 @@ jobs:
             node: 18
             host: arm64
             target: arm64
+          - os: ubuntu-24.04-arm64
+            node: 18
+            host: arm64
+            target: arm64
     name: ${{ matrix.os }} (host=${{ matrix.host }}, target=${{ matrix.target }})
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
@@ -45,12 +49,7 @@ jobs:
           node-version: ${{ matrix.node }}
           architecture: ${{ matrix.host }}
 
-      - name: Add yarn (self-hosted)
-        if: matrix.os == 'macos-15'
-        run: npm install -g yarn
-
       - name: Add setuptools for Python 3.12 (temp)
-        if: matrix.os != 'macos-15'
         run: pip install setuptools
 
       - name: Add msbuild to PATH
@@ -101,7 +100,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.node == 18
         with:
-          name: prebuilt-binaries
+          name: prebuilt-binaries-${{ matrix.os }}-${{ matrix.target }}
           path: prebuilds/*
           retention-days: 7
 
@@ -120,7 +119,6 @@ jobs:
         target:
           - linux/arm64
         variant:
-          - bullseye
           - alpine3.15
         include:
           # musl x64 builds
@@ -155,7 +153,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.node == 18
         with:
-          name: prebuilt-binaries
+          name: prebuilt-binaries-${{ matrix.variant }}
           path: prebuilds/*
           retention-days: 7