Skip to content

Commit d59dcc0

Browse files
authored
ci: build sample apps on latest macOS image and Xcode version (#5105)
1 parent da7b357 commit d59dcc0

File tree

2 files changed

+6
-32
lines changed

2 files changed

+6
-32
lines changed

.github/workflows/build.yml

+5-30
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
# With this we catch potential issues already in the PR.
3030
ios-swift-release:
3131
name: Release Build of iOS Swift
32-
runs-on: macos-14
32+
runs-on: macos-15
3333
steps:
3434
- uses: actions/checkout@v4
35-
- run: ./scripts/ci-select-xcode.sh 16.2
35+
- run: ./scripts/ci-select-xcode.sh 16.3
3636
- uses: ruby/setup-ruby@v1
3737
with:
3838
bundler-cache: true
@@ -50,47 +50,22 @@ jobs:
5050

5151
build-sample:
5252
name: Sample ${{ matrix.scheme }}
53-
runs-on: ${{ matrix.runs-on }}
53+
runs-on: macos-15
5454
strategy:
5555
fail-fast: false
5656
matrix:
5757
# other sample projects are built in ui-tests
5858
include:
5959
- scheme: macOS-Swift
60-
xcode: 15.4
61-
runs-on: macos-14
6260
- scheme: iOS13-Swift
63-
xcode: 15.4
64-
runs-on: macos-14
6561
- scheme: watchOS-Swift WatchKit App
66-
xcode: 15.4
67-
runs-on: macos-14
68-
# Only compiles on Xcode 16+
6962
- scheme: macOS-SwiftUI
70-
xcode: 16.2
71-
runs-on: macos-15
72-
7363
- scheme: SessionReplay-CameraTest
74-
xcode: 16.2
75-
runs-on: macos-15
76-
77-
# We have to compile on Xcode 16.3 because compiling on Xcode 16.2 fails with
78-
# Data+SentryTracing.swift:21:62: error: 'ReadingOptions' aliases 'Foundation.ReadingOptions'
79-
# and cannot be used here because C++ types from imported module 'Foundation' do not support
80-
# library evolution; this is an error in the Swift 6 language mode
8164
- scheme: visionOS-Swift
82-
xcode: 16.3
83-
runs-on: macos-15
8465

8566
steps:
8667
- uses: actions/checkout@v4
87-
- run: ./scripts/ci-select-xcode.sh ${{ matrix.xcode }}
88-
89-
- name: List Xcode Build Schemes
90-
run: >-
91-
xcodebuild
92-
-workspace Sentry.xcworkspace
93-
-list
68+
- run: ./scripts/ci-select-xcode.sh 16.3
9469

9570
# Note: Due to complexity in implementing the CODE_SIGNING_ALLOWED flag in the sentry-xcodebuild.sh script,
9671
# we did not yet migrate this step to use the script yet.
@@ -107,7 +82,7 @@ jobs:
10782
uses: actions/upload-artifact@v4
10883
if: ${{ failure() || cancelled() }}
10984
with:
110-
name: raw-build-output-os-${{matrix.runs-on}}-xcode-${{matrix.xcode}}-scheme-${{matrix.scheme}}
85+
name: raw-build-output-scheme-${{matrix.scheme}}
11186
path: |
11287
raw-build-output.log
11388

scripts/ci-select-xcode.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
set -euo pipefail
99

10-
# 14.3 is the default
11-
XCODE_VERSION="${1:-14.3}"
10+
XCODE_VERSION="${1}"
1211

1312
# We prefer this over calling `sudo xcode-select` because it will fail if the Xcode version
1413
# is not installed. Also xcodes is preinstalled on the GH runners.

0 commit comments

Comments
 (0)