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.

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 new M1 macOS GitHub runner to CI #4442

Merged
merged 40 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d6b164f
Merge branch 'MDAnalysis:develop' into develop
RMeli Jun 6, 2022
3fc3759
Merge remote-tracking branch 'upstream/develop' into develop
RMeli Jun 22, 2022
691e6a9
Merge branch 'MDAnalysis:develop' into develop
RMeli Jun 24, 2022
20b927e
Merge branch 'MDAnalysis:develop' into develop
RMeli Jul 8, 2022
907fedd
Merge branch 'MDAnalysis:develop' into develop
RMeli Jul 25, 2022
4aa042c
Merge branch 'MDAnalysis:develop' into develop
RMeli Aug 23, 2022
d66e3fe
Merge branch 'MDAnalysis:develop' into develop
RMeli Oct 5, 2022
c90db41
Merge branch 'MDAnalysis:develop' into develop
RMeli Oct 13, 2022
70243fc
Merge branch 'MDAnalysis:develop' into develop
RMeli Oct 31, 2022
8a2e0cd
Merge branch 'MDAnalysis:develop' into develop
RMeli Nov 2, 2022
3c93757
Merge remote-tracking branch 'upstream/develop' into develop
RMeli Nov 4, 2022
68fb913
Merge branch 'MDAnalysis:develop' into develop
RMeli Jan 17, 2023
742c0d1
Merge branch 'MDAnalysis:develop' into develop
RMeli Jan 27, 2023
dec35f9
Merge branch 'MDAnalysis:develop' into develop
RMeli Feb 15, 2023
8f1c54f
Merge branch 'MDAnalysis:develop' into develop
RMeli Feb 26, 2023
e5a31f7
Merge branch 'MDAnalysis:develop' into develop
RMeli Apr 1, 2023
a11dbc2
Merge branch 'MDAnalysis:develop' into develop
RMeli May 19, 2023
e2af3c5
Merge branch 'MDAnalysis:develop' into develop
RMeli Jun 6, 2023
954fef0
Merge branch 'MDAnalysis:develop' into develop
RMeli Oct 3, 2023
e9f87ed
Merge branch 'MDAnalysis:develop' into develop
RMeli Oct 12, 2023
6af293a
Merge branch 'develop' of https://github.com/RMeli/mdanalysis into de…
RMeli Jan 30, 2024
9388477
add m1 to ci
RMeli Jan 30, 2024
a17d6b9
no full deps
RMeli Jan 30, 2024
3af6982
no conda deps
RMeli Jan 30, 2024
a87e9e3
ectually modify the right thing...
RMeli Jan 30, 2024
ad2b7b0
os name
RMeli Jan 30, 2024
bfab56d
remove conda info/list
RMeli Jan 30, 2024
be209d6
add to cron
RMeli Jan 30, 2024
154ded7
mb
RMeli Jan 30, 2024
4ae688e
bump py
RMeli Jan 30, 2024
149af50
cron
RMeli Jan 30, 2024
82359f0
Merge branch 'develop' into ci-macos-m1
RMeli Jan 30, 2024
6111a19
bump
RMeli Jan 30, 2024
91605f6
fix latest
RMeli Feb 3, 2024
d109e59
exclude python 3.9 for macos-14 cron job
RMeli Feb 3, 2024
fa76401
🤦‍♂️
RMeli Feb 3, 2024
4cb63d4
Update gh-ci-cron.yaml
RMeli Feb 3, 2024
c6ceee9
Update .github/workflows/gh-ci.yaml
RMeli Feb 4, 2024
ce9d434
Update .github/workflows/gh-ci-cron.yaml
RMeli Feb 4, 2024
9c23ba0
cl
RMeli Feb 4, 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
4 changes: 2 additions & 2 deletions .github/actions/build-src/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ runs:
which python
which pip
pip list
conda info
conda list
micromamba info
micromamba list

- name: build_mda_main
shell: bash -l {0}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/gh-ci-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,16 @@ jobs:
pypi-latest-release:
# A set of runner to check that the latest conda release works as expected
if: "github.repository == 'MDAnalysis/mdanalysis'"
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
os: [ubuntu, macos, windows]
os: [ubuntu-latest, macos-latest, macos-14, windows-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
wheels: ['true', 'false']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be worth enabling cron CI - I can't remember if non-wheel build will work here, you might need to exclude macos-14 & wheels=false

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exclude:
- {os: "macos-14", python-version: "3.9"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this being disabled? as show in #4445 we should be able to build on 3.9 with macos-14

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version 3.9 was not found in the local cache
Error: The version '3.9' with architecture 'arm64' was not found for macOS 14.2.1.
The list of all available versions can be found here: https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json

I got this failure. Looking at the versions-manifest.json as suggested, it looks like all 3.9 is not provided with arch: arm64.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's.. odd. I've not glanced upstream, but we should probably keep an eye on updates - it's very possible they couldn't backport stuff properly until they had their own CI runners for this.

RMeli marked this conversation as resolved.
Show resolved Hide resolved
steps:
# Checkout to have access to local actions (i.e. setup-os)
- uses: actions/checkout@v4
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/gh-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,14 @@ jobs:
include:
- name: macOS_monterey_py311
os: macOS-12
python-version: "3.11"
python-version: "3.12"
full-deps: true
codecov: true
- name: macOS_M1
RMeli marked this conversation as resolved.
Show resolved Hide resolved
os: macOS-14
python-version: "3.12"
full-deps: false
codecov: true
- name: numpy_min
os: ubuntu-latest
python-version: 3.9
Expand Down
Loading