From 964b468a5aaf9f8868a45bd1e5090e25d2a2cb14 Mon Sep 17 00:00:00 2001
From: Jack Alto <jack.alto@mapbox.com>
Date: Tue, 23 Jan 2024 12:00:44 -0500
Subject: [PATCH] Select Xcode 14.1 in CodeQL jobs

- Align spm build script with Xcode 14.1 -> iOS 16.1 on iPhone 14
- Always pick macoslatest because do not build on ubuntu
---
 .github/workflows/codeql.yml | 7 ++++++-
 scripts/build_spm_sample.sh  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 1d603b97b..ec787a884 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    runs-on: macos-latest
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
@@ -39,6 +39,11 @@ jobs:
     env:
       SDK_REGISTRY_TOKEN: ${{ secrets.SDK_REGISTRY_TOKEN }}
 
+    steps:
+    - name: "Set Xcode version"
+      run: |
+        sudo xcode-select -s /Applications/Xcode_14.1.app
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
diff --git a/scripts/build_spm_sample.sh b/scripts/build_spm_sample.sh
index ab675f032..cdcdd268e 100755
--- a/scripts/build_spm_sample.sh
+++ b/scripts/build_spm_sample.sh
@@ -38,7 +38,7 @@ EOF
 
 BASEDIR="${BASEDIR}" xcodegen
 xcodebuild -resolvePackageDependencies -derivedDataPath derivedData -scheme CircleCIApp
-xcodebuild -scheme "CircleCIApp" -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' -derivedDataPath derivedData/ -project CircleCIApp.xcodeproj CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+xcodebuild -scheme "CircleCIApp" -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.1' -derivedDataPath derivedData/ -project CircleCIApp.xcodeproj CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
 
 popd