[ci] Add support for xcode 16

ossia · Oct 24, 2024 · 2c10f04 · 2c10f04
1 parent 9e6de36
commit 2c10f04
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/.github/workflows/mac-builds.yaml b/.github/workflows/mac-builds.yaml
@@ -3,6 +3,7 @@ on: [push,pull_request]
 
 jobs:
   brew:
+    # Last X86 macos version supported by GH Actions
     name: macOS (Release, Brew, Intel)
     runs-on: macos-13
 
@@ -26,14 +27,18 @@ jobs:
 
   brew-m1:
     name: macOS (Release, Brew, AppleSilicon)
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '>=16'
+
       - name: Dependencies
         run: |
           ./ci/osx-brew.deps.sh
@@ -44,14 +49,18 @@ jobs:
 
   brew-m1-dev:
     name: macOS (Dev, Brew, AppleSilicon)
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '>=16'
+
       - name: Dependencies
         run: |
           ./ci/osx-brew.deps.sh
@@ -62,13 +71,17 @@ jobs:
 
   m1-package:
     name: macOS (AppleSilicon Release)
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '>=16'
+
       - run: |
           source ci/osx-package.deps.sh
         env:

diff --git a/ci/osx-package.build.sh b/ci/osx-package.build.sh
@@ -5,7 +5,19 @@ export SCORE_DIR="$PWD"
 export SDK_DIR="$PWD/SDK"
 export PATH=/usr/local/bin:/opt/homebrew/bin:$PATH
 
-if [[ -d /Applications/Xcode_15.4.app ]]; then
+if [[ -d /Applications/Xcode_16.2.app ]]; then
+  export XCODE_ROOT=/Applications/Xcode_16.2.app
+  sudo xcode-select -s "$XCODE_ROOT"
+elif [[ -d /Applications/Xcode_16.1.app ]]; then
+  export XCODE_ROOT=/Applications/Xcode_16.1.app
+  sudo xcode-select -s "$XCODE_ROOT"
+elif [[ -d /Applications/Xcode_16.app ]]; then
+  export XCODE_ROOT=/Applications/Xcode_16.app
+  sudo xcode-select -s "$XCODE_ROOT"
+elif [[ -d /Applications/Xcode_16.0.app ]]; then
+  export XCODE_ROOT=/Applications/Xcode_16.0.app
+  sudo xcode-select -s "$XCODE_ROOT"
+elif [[ -d /Applications/Xcode_15.4.app ]]; then
   export XCODE_ROOT=/Applications/Xcode_15.4.app
   sudo xcode-select -s "$XCODE_ROOT"
 elif [[ -d /Applications/Xcode_15.3.app ]]; then