From 981087a2df8bb431d387202ed9437a3e47597564 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Wed, 31 Jan 2024 20:26:38 +0530 Subject: [PATCH 1/5] Add macOS M1 runner configuration for PR and scheduled tests See #3789, #3462 --- .github/workflows/run_periodic_tests.yml | 26 +++++++++++++++++++++++- .github/workflows/test_on_push.yml | 24 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml index 89f5d94cb8..d8d2fd172e 100644 --- a/.github/workflows/run_periodic_tests.yml +++ b/.github/workflows/run_periodic_tests.yml @@ -46,6 +46,18 @@ 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.8" + - os: macos-14 + python-version: "3.9" + - 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 +187,20 @@ 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.8" + - os: macos-14 + python-version: "3.9" + - 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..b3fdbcd0c6 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -43,6 +43,18 @@ jobs: exclude: - os: ubuntu-latest python-version: "3.11" + # Include macOS M1 runners + include: + - os: macos-14 + python-version: "3.8" + - os: macos-14 + python-version: "3.9" + - 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: @@ -180,6 +192,18 @@ 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.8" + - os: macos-14 + python-version: "3.9" + - 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: From f7aa5d44e7f0abed20f1a89dcbfc095197de2dfb Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Wed, 31 Jan 2024 20:34:02 +0530 Subject: [PATCH 2/5] Add `macos-14` to test conditions --- .github/workflows/test_on_push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index b3fdbcd0c6..f550280822 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -78,7 +78,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 @@ -227,7 +227,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 From 09ad0f9f89d68b385e54322c2fb1bc9efa56db88 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Wed, 31 Jan 2024 20:38:36 +0530 Subject: [PATCH 3/5] Exclude Python 3.8 and 3.9 for now from testing --- .github/workflows/test_on_push.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index f550280822..98a8307987 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -45,10 +45,10 @@ jobs: python-version: "3.11" # Include macOS M1 runners include: - - os: macos-14 - python-version: "3.8" - - os: macos-14 - python-version: "3.9" + # - os: macos-14 + # python-version: "3.8" + # - os: macos-14 + # python-version: "3.9" - os: macos-14 python-version: "3.10" - os: macos-14 @@ -194,10 +194,10 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] # Include macOS M1 runners include: - - os: macos-14 - python-version: "3.8" - - os: macos-14 - python-version: "3.9" + # - os: macos-14 + # python-version: "3.8" + # - os: macos-14 + # python-version: "3.9" - os: macos-14 python-version: "3.10" - os: macos-14 From 2ef8bb9e4a2bb4856eedc9a59b4292465eb61cc2 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:23:54 +0530 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: Eric G. Kratz --- .github/workflows/run_periodic_tests.yml | 4 ---- .github/workflows/test_on_push.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml index d8d2fd172e..fd1b5e12f4 100644 --- a/.github/workflows/run_periodic_tests.yml +++ b/.github/workflows/run_periodic_tests.yml @@ -48,10 +48,6 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] # Include macOS M1 runners include: - - os: macos-14 - python-version: "3.8" - - os: macos-14 - python-version: "3.9" - os: macos-14 python-version: "3.10" - os: macos-14 diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index 98a8307987..c0d6940dbe 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -194,10 +194,6 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] # Include macOS M1 runners include: - # - os: macos-14 - # python-version: "3.8" - # - os: macos-14 - # python-version: "3.9" - os: macos-14 python-version: "3.10" - os: macos-14 From 9e419a3b80b55def6cc72c0cc1de92852bbf8553 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:27:38 +0530 Subject: [PATCH 5/5] Remove some missed comments --- .github/workflows/run_periodic_tests.yml | 4 ---- .github/workflows/test_on_push.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml index fd1b5e12f4..7c3b59bee7 100644 --- a/.github/workflows/run_periodic_tests.yml +++ b/.github/workflows/run_periodic_tests.yml @@ -185,10 +185,6 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11"] # Include macOS M1 runners include: - - os: macos-14 - python-version: "3.8" - - os: macos-14 - python-version: "3.9" - os: macos-14 python-version: "3.10" - os: macos-14 diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index c0d6940dbe..16893a0c75 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -45,10 +45,6 @@ jobs: python-version: "3.11" # Include macOS M1 runners include: - # - os: macos-14 - # python-version: "3.8" - # - os: macos-14 - # python-version: "3.9" - os: macos-14 python-version: "3.10" - os: macos-14