Skip to content

Commit b45447e

Browse files
authored
Add macOS ARM runner (#506)
1 parent cf4c7cb commit b45447e

File tree

4 files changed

+122
-17
lines changed

4 files changed

+122
-17
lines changed

.github/workflows/build-binaries.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,26 @@ jobs:
1414
include:
1515
- os: ubuntu-latest
1616
package-suffix: linux-amd64
17-
- os: macos-latest
18-
package-suffix: macos-amd64
19-
- os: windows-latest
20-
package-suffix: windows-amd64
2117
- os: ubuntu-arm
2218
package-suffix: linux-aarch64
2319
# Need the 8 CPU version that has 12GB of RAM, the 4 CPU version
2420
# only has 6 GB.
2521
runsOn: buildjet-8vcpu-ubuntu-2204-arm
22+
- os: macos-intel
23+
package-suffix: macos-amd64
24+
runsOn: macos-12
25+
- os: macos-arm
26+
package-suffix: macos-aarch64
27+
runsOn: macos-14
28+
- os: windows-latest
29+
package-suffix: windows-amd64
2630
runs-on: ${{ matrix.runsOn || matrix.os }}
2731
steps:
2832
- uses: actions/checkout@v2
2933
with:
3034
submodules: recursive
31-
# actions/setup-python doesn't yet support ARM
32-
- if: ${{ !endsWith(matrix.os, '-arm') }}
35+
# actions/setup-python doesn't yet support Linux ARM
36+
- if: ${{ matrix.os != 'ubuntu-arm' }}
3337
uses: actions/setup-python@v4
3438
with:
3539
python-version: "3.12"

.github/workflows/ci.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
python: ["3.8", "3.12"]
16-
os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-arm]
16+
os: [ubuntu-latest, ubuntu-arm, macos-intel, macos-arm, windows-latest]
1717
include:
1818
- os: ubuntu-latest
1919
python: "3.12"
@@ -23,6 +23,17 @@ jobs:
2323
protoCheckTarget: true
2424
- os: ubuntu-arm
2525
runsOn: buildjet-4vcpu-ubuntu-2204-arm
26+
- os: macos-intel
27+
runsOn: macos-12
28+
- os: macos-arm
29+
runsOn: macos-14
30+
# macOS ARM 3.8 does not have an available Python build at
31+
# https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json.
32+
# See https://github.com/actions/setup-python/issues/808 and
33+
# https://github.com/actions/python-versions/pull/259.
34+
exclude:
35+
- os: macos-arm
36+
python: "3.8"
2637
runs-on: ${{ matrix.runsOn || matrix.os }}
2738
steps:
2839
- uses: actions/checkout@v2
@@ -34,8 +45,8 @@ jobs:
3445
- uses: Swatinem/rust-cache@v1
3546
with:
3647
working-directory: temporalio/bridge
37-
# actions/setup-python doesn't yet support ARM
38-
- if: ${{ !endsWith(matrix.os, '-arm') }}
48+
# actions/setup-python doesn't yet support Linux ARM
49+
- if: ${{ matrix.os != 'ubuntu-arm' }}
3950
uses: actions/setup-python@v4
4051
with:
4152
python-version: ${{ matrix.python }}

0 commit comments

Comments
 (0)