Merge pull request #21392 from mrclary/cbi-arm64

PR: Add macOS-arm64 target platform using M1 runner
spyder-ide · Feb 9, 2024 · 22f7e56 · 22f7e56
2 parents 8838ea6 + ca781a9
commit 22f7e56
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/.github/workflows/installers-conda.yml b/.github/workflows/installers-conda.yml
@@ -25,8 +25,13 @@ on:
         required: false
         default: false
         type: boolean
-      mac:
-        description: 'Build macOS installer'
+      macos-x86_64:
+        description: 'Build macOS x86_64 installer'
+        required: false
+        default: true
+        type: boolean
+      macos-arm64:
+        description: 'Build macOS arm64 installer'
         required: false
         default: true
         type: boolean
@@ -50,7 +55,8 @@ name: Nightly conda-based installers
 env:
   IS_RELEASE: ${{ github.event_name == 'release' }}
   ENABLE_SSH: ${{ github.event_name == 'workflow_dispatch' && inputs.ssh }}
-  BUILD_MAC: ${{ github.event_name != 'workflow_dispatch' || inputs.mac }}
+  BUILD_MAC: ${{ github.event_name != 'workflow_dispatch' || inputs.macos-x86_64 }}
+  BUILD_ARM: ${{ github.event_name != 'workflow_dispatch' || inputs.macos-arm64 }}
   BUILD_LNX: ${{ github.event_name != 'workflow_dispatch' || inputs.linux }}
   BUILD_WIN: ${{ github.event_name != 'workflow_dispatch' || inputs.win }}
   USE_SUBREPOS: ${{ github.event_name == 'schedule' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && ! inputs.pre) }}
@@ -73,6 +79,10 @@ jobs:
             target_platform="'osx-64'"
             include="{'os': 'macos-11', 'target-platform': 'osx-64', 'spyk-arch': 'unix'}"
         fi
+        if [[ $BUILD_ARM == "true" ]]; then
+            target_platform=${target_platform:+"$target_platform, "}"'osx-arm64'"
+            include=${include:+"$include, "}"{'os': 'macos-14', 'target-platform': 'osx-arm64', 'spyk-arch': 'unix'}"
+        fi
         if [[ $BUILD_LNX == "true" ]]; then
             target_platform=${target_platform:+"$target_platform, "}"'linux-64'"
             include=${include:+"$include, "}"{'os': 'ubuntu-latest', 'target-platform': 'linux-64', 'spyk-arch': 'unix'}"