Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 5 additions & 30 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
# With this we catch potential issues already in the PR.
ios-swift-release:
name: Release Build of iOS Swift
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- run: ./scripts/ci-select-xcode.sh 16.2
- run: ./scripts/ci-select-xcode.sh 16.3
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand All @@ -50,47 +50,22 @@ jobs:

build-sample:
name: Sample ${{ matrix.scheme }}
runs-on: ${{ matrix.runs-on }}
runs-on: macos-15
strategy:
fail-fast: false
matrix:
# other sample projects are built in ui-tests
include:
- scheme: macOS-Swift
xcode: 15.4
runs-on: macos-14
- scheme: iOS13-Swift
xcode: 15.4
runs-on: macos-14
- scheme: watchOS-Swift WatchKit App
xcode: 15.4
runs-on: macos-14
# Only compiles on Xcode 16+
- scheme: macOS-SwiftUI
xcode: 16.2
runs-on: macos-15

- scheme: SessionReplay-CameraTest
xcode: 16.2
runs-on: macos-15

# We have to compile on Xcode 16.3 because compiling on Xcode 16.2 fails with
# Data+SentryTracing.swift:21:62: error: 'ReadingOptions' aliases 'Foundation.ReadingOptions'
# and cannot be used here because C++ types from imported module 'Foundation' do not support
# library evolution; this is an error in the Swift 6 language mode
- scheme: visionOS-Swift
xcode: 16.3
runs-on: macos-15

steps:
- uses: actions/checkout@v4
- run: ./scripts/ci-select-xcode.sh ${{ matrix.xcode }}

- name: List Xcode Build Schemes
run: >-
xcodebuild
-workspace Sentry.xcworkspace
-list
- run: ./scripts/ci-select-xcode.sh 16.3

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

Expand Down
3 changes: 1 addition & 2 deletions scripts/ci-select-xcode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

set -euo pipefail

# 14.3 is the default
XCODE_VERSION="${1:-14.3}"
XCODE_VERSION="${1}"

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