chore(ci): update xcode (#92)

nfrechette · Jul 6, 2024 · c9490dd · c9490dd
2 parents 8dc3344 + 739a88d
commit c9490dd
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 40 deletions.
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
@@ -15,7 +15,7 @@ jobs:
         compiler: [clang4]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x86)
@@ -70,7 +70,7 @@ jobs:
         compiler: [gcc5, gcc6, gcc7, gcc8, clang5, clang6, clang7, clang8, clang9, clang10]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x86)
@@ -125,7 +125,7 @@ jobs:
         compiler: [gcc9, gcc10, gcc11, clang11, clang12, clang13, clang14]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x86)
@@ -180,7 +180,7 @@ jobs:
         compiler: [gcc12, gcc13, clang15, clang16, clang17, clang18]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x86)
@@ -228,14 +228,14 @@ jobs:
         with:
           args: 'python3 make.py -ci -compiler ${{ matrix.compiler }} -config Release -cpu x64 -unit_test'
 
-  osx-11:
-    runs-on: macos-11
+  osx-12:
+    runs-on: macos-12
     strategy:
       matrix:
-        compiler: [xcode12, xcode13]
+        compiler: [xcode13]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Setup ${{ matrix.compiler }} compiler
@@ -259,28 +259,28 @@ jobs:
       - name: Building for iOS (release-arm64)
         run: python3 make.py -ci -compiler ios -config Release -build
 
-  osx-12:
-    runs-on: macos-12
+  osx-14:
+    runs-on: macos-14
     strategy:
       matrix:
-        compiler: [xcode14]
+        compiler: [xcode14, xcode15]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Setup ${{ matrix.compiler }} compiler
         run: ./tools/setup_osx_compiler.sh ${{ matrix.compiler }}
-      - name: Building (debug-x64)
-        run: python3 make.py -ci -compiler osx -config Debug -cpu x64 -build
-      - name: Running unit tests (debug-x64)
-        run: python3 make.py -ci -compiler osx -config Debug -cpu x64 -unit_test
+      - name: Building (debug-arm64)
+        run: python3 make.py -ci -compiler osx -config Debug -build
+      - name: Running unit tests (debug-arm64)
+        run: python3 make.py -ci -compiler osx -config Debug -unit_test
       - name: Clean
         run: python3 make.py -clean_only
-      - name: Building (release-x64)
-        run: python3 make.py -ci -compiler osx -config Release -cpu x64 -build
-      - name: Running unit tests (release-x64)
-        run: python3 make.py -ci -compiler osx -config Release -cpu x64 -unit_test
+      - name: Building (release-arm64)
+        run: python3 make.py -ci -compiler osx -config Release -build
+      - name: Running unit tests (release-arm64)
+        run: python3 make.py -ci -compiler osx -config Release -unit_test
       - name: Clean
         run: python3 make.py -clean_only
       - name: Building for iOS (debug-arm64)
@@ -294,7 +294,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug)
@@ -322,7 +322,7 @@ jobs:
     runs-on: windows-2019
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x64)
@@ -360,7 +360,7 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x64)

diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -15,7 +15,7 @@ jobs:
         compiler: [gcc13, clang18]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x86)
@@ -63,28 +63,28 @@ jobs:
         with:
           args: 'python3 make.py -ci -compiler ${{ matrix.compiler }} -config Release -cpu x64 -unit_test'
 
-  osx-12:
-    runs-on: macos-12
+  osx-14:
+    runs-on: macos-14
     strategy:
       matrix:
-        compiler: [xcode14]
+        compiler: [xcode15]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Setup ${{ matrix.compiler }} compiler
         run: ./tools/setup_osx_compiler.sh ${{ matrix.compiler }}
-      - name: Building (debug-x64)
-        run: python3 make.py -ci -compiler osx -config Debug -cpu x64 -build
-      - name: Running unit tests (debug-x64)
-        run: python3 make.py -ci -compiler osx -config Debug -cpu x64 -unit_test
+      - name: Building (debug-arm64)
+        run: python3 make.py -ci -compiler osx -config Debug -build
+      - name: Running unit tests (debug-arm64)
+        run: python3 make.py -ci -compiler osx -config Debug -unit_test
       - name: Clean
         run: python3 make.py -clean_only
-      - name: Building (release-x64)
-        run: python3 make.py -ci -compiler osx -config Release -cpu x64 -build
-      - name: Running unit tests (release-x64)
-        run: python3 make.py -ci -compiler osx -config Release -cpu x64 -unit_test
+      - name: Building (release-arm64)
+        run: python3 make.py -ci -compiler osx -config Release -build
+      - name: Running unit tests (release-arm64)
+        run: python3 make.py -ci -compiler osx -config Release -unit_test
       - name: Clean
         run: python3 make.py -clean_only
       - name: Building for iOS (debug-arm64)
@@ -98,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug)
@@ -126,7 +126,7 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Building (debug-x64)

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - name: Build with wrapper

diff --git a/tools/setup_osx_compiler.sh b/tools/setup_osx_compiler.sh
@@ -4,6 +4,10 @@
 COMPILER=$1
 
 # See Github hosted runners:
+# macos-14: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
+#   xcode 14.3.1, 15.0.1, 15.1, 15.2, 15.3, 15.4, 16.0
+# macos-13: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+#   xcode 14.1, 14.2, 14.3.1, 15.0.1, 15.1, 15.2
 # macos-12: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
 #   xcode 13.1, 12.2.1, 13.3.1, 13.4.1, 14.1, 14.2
 # maxos-11: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md
@@ -22,7 +26,11 @@ elif [[ $COMPILER == xcode12 ]]; then
 elif [[ $COMPILER == xcode13 ]]; then
     XCODE_PATH="/Applications/Xcode_13.2.1.app"
 elif [[ $COMPILER == xcode14 ]]; then
-    XCODE_PATH="/Applications/Xcode_14.2.app"
+    XCODE_PATH="/Applications/Xcode_14.3.1.app"
+elif [[ $COMPILER == xcode15 ]]; then
+    XCODE_PATH="/Applications/Xcode_15.2.app"
+elif [[ $COMPILER == xcode16 ]]; then
+    XCODE_PATH="/Applications/Xcode_16.0.app"
 fi
 
 # Select our XCode version