diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml index 89f5d94cb8..7c3b59bee7 100644 --- 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 index b0ebf04e38..16893a0c75 100644 --- 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 @@ -180,6 +188,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: @@ -203,7 +219,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