Add macOS ARM runner (#506)

temporalio · Apr 12, 2024 · b45447e · b45447e
1 parent cf4c7cb
commit b45447e
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 17 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -14,22 +14,26 @@ jobs:
         include:
           - os: ubuntu-latest
             package-suffix: linux-amd64
-          - os: macos-latest
-            package-suffix: macos-amd64
-          - os: windows-latest
-            package-suffix: windows-amd64
           - os: ubuntu-arm
             package-suffix: linux-aarch64
             # Need the 8 CPU version that has 12GB of RAM, the 4 CPU version
             # only has 6 GB.
             runsOn: buildjet-8vcpu-ubuntu-2204-arm
+          - os: macos-intel
+            package-suffix: macos-amd64
+            runsOn: macos-12
+          - os: macos-arm
+            package-suffix: macos-aarch64
+            runsOn: macos-14
+          - os: windows-latest
+            package-suffix: windows-amd64
     runs-on: ${{ matrix.runsOn || matrix.os }}
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      # actions/setup-python doesn't yet support ARM
-      - if: ${{ !endsWith(matrix.os, '-arm') }}
+      # actions/setup-python doesn't yet support Linux ARM
+      - if: ${{ matrix.os != 'ubuntu-arm' }}
         uses: actions/setup-python@v4
         with:
           python-version: "3.12"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: true
       matrix:
         python: ["3.8", "3.12"]
-        os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-arm]
+        os: [ubuntu-latest, ubuntu-arm, macos-intel, macos-arm, windows-latest]
         include:
           - os: ubuntu-latest
             python: "3.12"
@@ -23,6 +23,17 @@ jobs:
             protoCheckTarget: true
           - os: ubuntu-arm
             runsOn: buildjet-4vcpu-ubuntu-2204-arm
+          - os: macos-intel
+            runsOn: macos-12
+          - os: macos-arm
+            runsOn: macos-14
+        # macOS ARM 3.8 does not have an available Python build at
+        # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json.
+        # See https://github.com/actions/setup-python/issues/808 and
+        # https://github.com/actions/python-versions/pull/259.
+        exclude:
+          - os: macos-arm
+            python: "3.8"
     runs-on: ${{ matrix.runsOn || matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -34,8 +45,8 @@ jobs:
       - uses: Swatinem/rust-cache@v1
         with:
           working-directory: temporalio/bridge
-      # actions/setup-python doesn't yet support ARM
-      - if: ${{ !endsWith(matrix.os, '-arm') }}
+      # actions/setup-python doesn't yet support Linux ARM
+      - if: ${{ matrix.os != 'ubuntu-arm' }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}