Use the new M1 runners on GitHub

This means we can natively build/test on Apple Silicon hardware
brian-team · Jan 31, 2024 · 9072231 · 9072231
1 parent 12f35d2
commit 9072231
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/publish_to_pypi.yml b/.github/workflows/publish_to_pypi.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, macOS-latest ]
+        os: [ windows-latest, macOS-12, macOS-14 ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -37,9 +37,8 @@ jobs:
           output-dir: dist
         env:
           CIBW_PROJECT_REQUIRES_PYTHON: ">=${{ needs.get_python_versions.outputs.min-python }}"
-          CIBW_ARCHS_WINDOWS: auto64
-          CIBW_ARCHS_MACOS: x86_64 universal2
-          CIBW_TEST_SKIP: '*_arm64 *_universal2:arm64'
+          CIBW_ARCHS: auto64
+          # Do not build for PyPy
           CIBW_SKIP: 'pp*'
           CIBW_TEST_COMMAND: python {project}/dev/continuous-integration/run_simple_test.py
           CIBW_TEST_REQUIRES: pytest

diff --git a/.github/workflows/test_latest.yml b/.github/workflows/test_latest.yml
@@ -30,7 +30,8 @@ jobs:
       matrix:
         os: [{image: ubuntu-latest, triplet: x64-linux},
              {image: windows-latest, triplet: x64-windows},
-             {image: macOS-latest, triplet: x64-osx}]
+             {image: macOS-12, triplet: x64-osx},
+             {image: macOS-14, truplet: arm64-osx}]
         standalone: [false, true]
         float_dtype_32: [false, true]
         python-version: ["${{ needs.get_python_versions.outputs.max-python }}"]

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
@@ -38,16 +38,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macOS-11]
+        os: [ubuntu-22.04, windows-2022, macOS-12, macOS-14]
         standalone: [false, true]
         float_dtype_32: [false, true]
         python-version: ["${{ needs.get_python_versions.outputs.max-python }}"]
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             standalone: false
             python-version: "${{ needs.get_python_versions.outputs.min-python }}"
             float_dtype_32: false
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             standalone: true
             python-version: "${{ needs.get_python_versions.outputs.min-python }}"
             float_dtype_32: false