Add macOS M1 runner testing configuration for PRs and scheduled tests (…

…pybamm-team#3791) * Add macOS M1 runner configuration for PR and scheduled tests See pybamm-team#3789, pybamm-team#3462 * Add `macos-14` to test conditions * Exclude Python 3.8 and 3.9 for now from testing * Apply suggestions from code review Co-authored-by: Eric G. Kratz <[email protected]> * Remove some missed comments --------- Co-authored-by: Eric G. Kratz <[email protected]>
js1tr3 · Aug 12, 2024 · ee37f2d · ee37f2d
1 parent 50ee8f5
commit ee37f2d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml
@@ -46,6 +46,14 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        # Include macOS M1 runners
+        include:
+          - os: macos-14
+            python-version: "3.10"
+          - os: macos-14
+            python-version: "3.11"
+          - os: macos-14
+            python-version: "3.12"
 
     steps:
       - name: Check out PyBaMM repository
@@ -175,8 +183,16 @@ jobs:
         matrix:
             os: [ubuntu-latest, macos-latest]
             python-version: ["3.8", "3.9", "3.10", "3.11"]
+          # Include macOS M1 runners
+            include:
+              - os: macos-14
+                python-version: "3.10"
+              - os: macos-14
+                python-version: "3.11"
+              - os: macos-14
+                python-version: "3.12"
         fail-fast: false
-    name: Test pybamm_install_odes on ${{ matrix.os }}
+    name: Test pybamm_install_odes (${{ matrix.os }} / Python ${{ matrix.python-version }})
 
     steps:
       - name: Check out PyBaMM repository

diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml
@@ -43,6 +43,14 @@ jobs:
         exclude:
           - os: ubuntu-latest
             python-version: "3.11"
+        # Include macOS M1 runners
+        include:
+          - os: macos-14
+            python-version: "3.10"
+          - os: macos-14
+            python-version: "3.11"
+          - os: macos-14
+            python-version: "3.12"
     name: Unit tests (${{ matrix.os }} / Python ${{ matrix.python-version }})
 
     steps:
@@ -66,7 +74,7 @@ jobs:
           sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
       - name: Install macOS system dependencies
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-latest' || matrix.os == 'macos-14'
         env:
           # Homebrew environment variables
           HOMEBREW_NO_INSTALL_CLEANUP: 1
@@ -179,6 +187,14 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        # Include macOS M1 runners
+        include:
+          - os: macos-14
+            python-version: "3.10"
+          - os: macos-14
+            python-version: "3.11"
+          - os: macos-14
+            python-version: "3.12"
     name: Integration tests (${{ matrix.os }} / Python ${{ matrix.python-version }})
 
     steps:
@@ -202,7 +218,7 @@ jobs:
           sudo apt-get install libopenblas-dev texlive-latex-extra dvipng
 
       - name: Install macOS system dependencies
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-latest' || matrix.os == 'macos-14'
         env:
           # Homebrew environment variables
           HOMEBREW_NO_INSTALL_CLEANUP: 1