diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml index 3e1bb80a43..cd17a55979 100644 --- a/.github/workflows/run_periodic_tests.yml +++ b/.github/workflows/run_periodic_tests.yml @@ -44,17 +44,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-latest, macos-12, macos-14, windows-latest] python-version: ["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 uses: actions/checkout@v4 diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index 69a48bab36..803b0df961 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -36,20 +36,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-latest, macos-12, macos-14, windows-latest] python-version: ["3.9", "3.10", "3.11", "3.12"] # We check coverage on Ubuntu with Python 3.12, so we skip unit tests for it here exclude: - os: ubuntu-latest python-version: "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: Unit tests (${{ matrix.os }} / Python ${{ matrix.python-version }}) steps: @@ -184,18 +176,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-latest, macos-12, macos-14, windows-latest] python-version: ["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: - name: Check out PyBaMM repository uses: actions/checkout@v4