From 804a80ad09163f43afe953cd2d1e70ca9339370a Mon Sep 17 00:00:00 2001
From: Stefan Jandl <reg@bitfox.at>
Date: Mon, 30 Sep 2024 03:25:10 +0200
Subject: [PATCH] chore: Bump to  Xcode 16 on CI (#3635)

Co-authored-by: @jamescrosswell
---
 .github/workflows/build.yml                      | 16 ++++++++++++++--
 .../SamplingTransactionProfilerTests.cs          |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ab22bc5e0..71a34d45ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
       - "**.md"
 
 env:
-  XCODE_VERSION: 15.4
+  XCODE_VERSION: 16
 
 jobs:
   build-sentry-native:
@@ -70,7 +70,13 @@ jobs:
         if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
         uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
 
-      # We only use Xcode 15.4
+      - name: Setup Xcode
+        if: matrix.os == 'macos-latest'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
+          xcodebuild -version
+
+      # We only use Xcode 16
       - name: Remove unused applications
         if: matrix.os == 'macos-latest'
         run: |
@@ -197,6 +203,12 @@ jobs:
         with:
           dotnet-version: 8.0.x
 
+      - name: Setup Xcode
+        if: matrix.os == 'macos-latest'
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_${{env.XCODE_VERSION}}.app/Contents/Developer
+          xcodebuild -version
+
       # Needed for Android SDK setup step
       - uses: actions/setup-java@v4
         with:
diff --git a/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs b/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
index 68d55e1893..8d42e1e13a 100644
--- a/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
+++ b/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
@@ -286,6 +286,8 @@ async Task VerifyAsync(HttpRequestMessage message)
     [SkippableFact]
     private async Task Profiler_ThrowingOnSessionStartup_DoesntBreakSentryInit()
     {
+        Skip.If(TestEnvironment.IsGitHubActions);
+
         SampleProfilerSession.ThrowOnNextStartupForTests = true;
 
         var tcs = new TaskCompletionSource<string>();