From aa4d3c88ca617c530a2ade02ff16cb288103556b Mon Sep 17 00:00:00 2001
From: Tomas Camin <tomas.camin@adevinta.com>
Date: Wed, 21 Feb 2024 09:29:49 +0100
Subject: [PATCH] Bump Xcode

---
 .github/workflows/ci.yml | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f548fea..bf2603e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,28 +4,23 @@ on: [pull_request]
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - ios: "16.2"
-            os: "macos-latest"
-            xcode: "14.2"
-    name: Run UI Test on iOS ${{ matrix.ios }}
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-13 # macos-latest does not ship with Xcode 15
+
+    name: Run UI Test on iOS
     env:
-      platform: ${{ 'iOS Simulator' }}
+      xcode_version: "15.2"
     steps:
+      - name: List Xcode installations
+        run: sudo ls -1 /Applications | grep "Xcode"
+      - name: Select Xcode version ${{ env.xcode_version }}
+        run: |
+          sudo xcode-select -s /Applications/Xcode_${{ env.xcode_version }}.app/Contents/Developer
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install required tools
         run: |
           brew update
           brew install xcodegen
-      - name: Select Xcode version ${{ matrix.xcode }}
-        run: |
-          sudo xcversion installed
-          sudo xcversion select ${{ matrix.xcode }}
       - name: Generate projects;
         run: |
           cd Example; xcodegen
@@ -39,7 +34,7 @@ jobs:
       - name: Collect UI Tests artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: SBTUITestTunnel_Tests_iOS_${{ matrix.ios }}.xcresult
+          name: SBTUITestTunnel_Tests_iOS.xcresult
           path: SBTUITestTunnel_Tests.xcresult
         if: success() || failure()
       - name: Run no swizzling UI Tests
@@ -48,7 +43,7 @@ jobs:
       - name: Collect no swizzling UI Tests artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: SBTUITestTunnel_TestsNoSwizzling_iOS_${{ matrix.ios }}.xcresult
+          name: SBTUITestTunnel_TestsNoSwizzling_iOS.xcresult
           path: SBTUITestTunnel_TestsNoSwizzling.xcresult
         if: success() || failure()
       - name: Build SPM App
@@ -56,4 +51,4 @@ jobs:
           Scripts/run_build.rb Example/SPM/SBTUITestTunnel.xcodeproj
       - name: Run SPM UI Tests
         run: |
-          Scripts/run_uitests.rb Example/SPM/SBTUITestTunnel.xcodeproj
\ No newline at end of file
+          Scripts/run_uitests.rb Example/SPM/SBTUITestTunnel.xcodeproj