Skip to content

Commit 15193b3

Browse files
author
Matthias Koeppe
committed
.github/workflows/macos.yml: Add tests on M1 runners
1 parent f4e2aff commit 15193b3

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.github/workflows/macos.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,22 @@ on:
1919
type: string
2020
# System configuration
2121
osversion_xcodeversion_toxenv_tuples:
22+
# As of 2024-02, "runs-on: macos-latest" is macos-12.
23+
# and "runs-on: macos-14" selects the new M1 runners.
24+
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
2225
description: 'Stringified JSON object'
2326
default: >-
24-
[["latest", "", "homebrew-macos-usrlocal-minimal"],
25-
["latest", "", "homebrew-macos-usrlocal-standard"],
26-
["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal"],
27+
[["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal"],
28+
["12", "", "homebrew-macos-usrlocal-minimal"],
2729
["12", "", "homebrew-macos-usrlocal-standard"],
30+
["12", "", "homebrew-macos-usrlocal-python3_xcode-standard"],
31+
["12", "", "homebrew-macos-usrlocal-maximal"],
2832
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
29-
["latest", "", "homebrew-macos-usrlocal-maximal"],
30-
["latest", "", "homebrew-macos-usrlocal-python3_xcode-standard"],
33+
["14", "", "homebrew-macos-opthomebrew-standard"],
3134
["latest", "", "conda-forge-macos-minimal"],
32-
["latest", "", "conda-forge-macos-standard"]]
35+
["latest", "", "conda-forge-macos-standard"],
36+
["14", "", "conda-forge-macos-minimal"],
37+
["14", "", "conda-forge-macos-standard"]]
3338
type: string
3439
extra_sage_packages:
3540
description: 'Extra Sage packages to install as system packages'

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,9 @@ setenv =
512512
# brew caches downloaded files in ${HOME}/Library/Caches. We share it between different toxenvs.
513513
homebrew: SYSTEM=homebrew
514514
local-homebrew: HOMEBREW={envdir}/homebrew
515+
# /opt/homebrew is the default install location on arm64 macOS
516+
local-homebrew-opthomebrew: HOMEBREW=/opt/homebrew
517+
# /usr/local is the default install location on x86_64 macOS
515518
local-{homebrew-usrlocal,nohomebrew}: HOMEBREW=/usr/local
516519
# local-macos-nohomebrew: "best effort" isolation to avoid using a homebrew installation in /usr/local
517520
# We use liblzma from the macOS system - which is available but its headers are not (neither is the xz executable).

0 commit comments

Comments
 (0)