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

Build and test installers natively on Apple Silicon M1 (macOS 14) #249

Merged
merged 25 commits into from
Feb 19, 2024

Conversation

hoechenberger
Copy link
Member

@hoechenberger hoechenberger commented Feb 18, 2024

@larsoner I know you love this stuff ;)
I just wanted to get us started

We need to change extract_version.sh, I think you have a much better understanding of what needs to be done than I do. Please do feel free to take over if you want!!

FYI macOS-14 exclusively runs on M1, while earlier macOS runners exclusively run on Intel. This just to explain why I removed the architecture identifier from the job matrix in favor of just having the OS version listed.

Closes #248

@hoechenberger hoechenberger changed the title Start using Apple Silicon, and add test on macOS-13 (Intel) Start using Apple Silicon on macOS-14, and add test on macOS-13 (Intel) Feb 18, 2024
# include:
# - os: macos-11
# arch: arm64
os: [macos-11, macos-12, macos-13, 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.

also added macOS-13 here (runs on Intel; macos-14 always runs on M1)

Comment on lines -87 to -90
if [[ "$MNE_CROSSCOMPILE_ARCH" == "arm64" ]]; then
echo "PLATFORM_ARG=--platform=osx-arm64" >> $GITHUB_ENV
echo "EXE_ARG=--conda-exe=${CONDA_PREFIX}/standalone_conda/conda.exe" >> $GITHUB_ENV
fi
Copy link
Member Author

Choose a reason for hiding this comment

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

we shouldn't need this anymore, but I'm not sure about the implications

@hoechenberger hoechenberger changed the title Start using Apple Silicon on macOS-14, and add test on macOS-13 (Intel) Build and test installers natively on Apple Silicon M1 (macOS 14) Feb 18, 2024
@hoechenberger hoechenberger marked this pull request as ready for review February 18, 2024 18:00
@hoechenberger
Copy link
Member Author

@larsoner I think this is good to go

@larsoner larsoner merged commit 6ef3a4b into mne-tools:main Feb 19, 2024
15 checks passed
@larsoner
Copy link
Member

Awesome @hoechenberger !

larsoner added a commit to larsoner/mne-installers that referenced this pull request Feb 21, 2024
* upstream/main:
  [pre-commit.ci] pre-commit autoupdate (mne-tools#251)
  Build and test installers natively on Apple Silicon M1 (macOS 14) (mne-tools#249)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#247)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Test on Apple Silicon via GH-hosted runner
2 participants