Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add macOS M1 runner testing configuration for PRs and scheduled tests #3791

Merged
merged 6 commits into from
Feb 1, 2024
Merged

Add macOS M1 runner testing configuration for PRs and scheduled tests #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
981087a
Add macOS M1 runner configuration for PR and scheduled tests
agriyakhetarpal Jan 31, 2024
f7aa5d4
Add `macos-14` to test conditions
agriyakhetarpal Jan 31, 2024
09ad0f9
Exclude Python 3.8 and 3.9 for now from testing
agriyakhetarpal Jan 31, 2024
2ef8bb9
Apply suggestions from code review
agriyakhetarpal Feb 1, 2024
2d99fe1
Merge branch 'develop' into test-pybamm-with-m1-runner
agriyakhetarpal Feb 1, 2024
9e419a3
Remove some missed comments
agriyakhetarpal Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .github/workflows/run_periodic_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/test_on_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
Loading