Skip to content

Commit f1e980c

Browse files
Merge pull request #242 from Distributive-Network/Xmader/ci/github-m1-runner
CI: use GitHub hosted runners to build for arm64 macOS
2 parents 1921a9a + 1e089df commit f1e980c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/test-and-publish.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
# Use Ubuntu 20.04 / macOS 13 + Python 3.10 to build SpiderMonkey
29-
os: [ 'ubuntu-20.04', 'macos-13', 'm2ci' ]
28+
# Use Ubuntu 20.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
29+
os: [ 'ubuntu-20.04', 'macos-13', 'macos-14' ] # macOS 14 runner exclusively runs on M1 hardwares
30+
# see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
3031
python_version: [ '3.10' ]
3132
runs-on: ${{ matrix.os }}
3233
steps:
@@ -43,7 +44,7 @@ jobs:
4344
key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
4445
lookup-only: true # skip download
4546
- name: Setup XCode
46-
if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
47+
if: ${{ (matrix.os == 'macos-13' || matrix.os == 'macos-14') && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
4748
# SpiderMonkey 115 ESR requires XCode SDK version at least 13.3
4849
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#installed-sdks
4950
run: sudo xcode-select -switch /Applications/Xcode_14.3.app
@@ -88,7 +89,7 @@ jobs:
8889
fail-fast: false
8990
matrix:
9091
# The lowest supported version is Ubuntu 20.04 + Python 3.8 or macOS 12 + Python 3.9
91-
os: [ 'ubuntu-20.04', 'macos-12', 'windows-2019', 'm2ci' ]
92+
os: [ 'ubuntu-20.04', 'macos-12', 'windows-2019', 'macos-14' ]
9293
python_version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
9394
exclude:
9495
# macOS 12 comes with Python 3.9 by default, so we drop ci support for Python 3.8 on macOS
@@ -97,9 +98,9 @@ jobs:
9798
python_version: '3.8'
9899
# actions/setup-python: The version '3.8'/'3.9' with architecture 'arm64' was not found for macOS.
99100
# see https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
100-
- os: 'm2ci'
101+
- os: 'macos-14'
101102
python_version: '3.8'
102-
- os: 'm2ci'
103+
- os: 'macos-14'
103104
python_version: '3.9'
104105
runs-on: ${{ matrix.os }}
105106
steps:

0 commit comments

Comments
 (0)