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
14 changes: 5 additions & 9 deletions .github/workflows/build-xcframework-variant-slices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
build-xcframework-variant-slices:
name: ${{matrix.sdk}}

# We must compile this on an arm64 runner, cause it's required for visionOS. macos-14 uses arm64.
# We must compile this on an arm64 runner, cause it's required for visionOS. macos-15 uses arm64.
# To see the available runners see https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories.
runs-on: macos-14
runs-on: macos-15

strategy:
matrix:
Expand All @@ -67,12 +67,8 @@ jobs:
steps:
- uses: actions/checkout@v5

# We have to compile on Xcode 15.2 because compiling on Xcode 15.4 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
# We also can't use Xcode 16.x because validating the XCFramework then fails with Xcode 15.x.
- run: ./scripts/ci-select-xcode.sh 15.2
# We use Xcode 16.4 for building XCFrameworks as it's the standard version available on macos-15 runners.
- run: ./scripts/ci-select-xcode.sh 16.4
shell: bash

- name: Get version
Expand Down Expand Up @@ -109,7 +105,7 @@ jobs:
env:
VERSION: ${{ env.VERSION }}
run: |
./scripts/ci-select-xcode.sh 15.2
./scripts/ci-select-xcode.sh 16.4
make bump-version TO=$VERSION

- name: Build ${{inputs.name}}${{inputs.suffix}} XCFramework slice for ${{matrix.sdk}}
Expand Down
35 changes: 20 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:

validate-xcframework:
name: Validate XCFramework
runs-on: macos-14
runs-on: macos-15
needs: [files-changed, assemble-xcframework-variant]
# Run the job only for PRs with related changes or non-PR events.
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
Expand All @@ -120,7 +120,7 @@ jobs:
with:
pattern: xcframework-${{github.sha}}-sentry-swiftui
path: Carthage/
- run: ./scripts/ci-select-xcode.sh 15.4
- run: ./scripts/ci-select-xcode.sh 16.4
- run: make build-xcframework-sample
- name: Run CI Diagnostics
if: failure()
Expand All @@ -131,7 +131,7 @@ jobs:
# See https://github.community/t/github-sha-isnt-the-value-expected/17903/17906.
validate-spm:
name: Validate SPM Static
runs-on: macos-14
runs-on: macos-15
needs: [files-changed, assemble-xcframework-variant]
# Run the job only for PRs with related changes or non-PR events.
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
Expand All @@ -145,6 +145,7 @@ jobs:
uses: ./.github/actions/prepare-package.swift
with:
is-pr: ${{ github.event_name == 'pull_request' }}
- run: ./scripts/ci-select-xcode.sh 16.4
- run: swift build
working-directory: Samples/macOS-SPM-CommandLine
- name: Run CI Diagnostics
Expand All @@ -153,7 +154,7 @@ jobs:

validate-spm-dynamic:
name: Validate SPM Dynamic
runs-on: macos-14
runs-on: macos-15
needs: [files-changed, assemble-xcframework-variant]
# Run the job only for PRs with related changes or non-PR events.
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
Expand All @@ -167,6 +168,7 @@ jobs:
uses: ./.github/actions/prepare-package.swift
with:
is-pr: ${{ github.event_name == 'pull_request' }}
- run: ./scripts/ci-select-xcode.sh 16.4
- run: swift build
working-directory: Samples/SPM-Dynamic
- name: Run CI Diagnostics
Expand All @@ -175,7 +177,7 @@ jobs:

swift-build:
name: Build Swift Static
runs-on: macos-14
runs-on: macos-15
needs: [files-changed, assemble-xcframework-variant]
# Run the job only for PRs with related changes or non-PR events.
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
Expand All @@ -189,14 +191,15 @@ jobs:
uses: ./.github/actions/prepare-package.swift
with:
is-pr: ${{ github.event_name == 'pull_request' }}
- run: ./scripts/ci-select-xcode.sh 16.4
- run: swift build
- name: Run CI Diagnostics
if: failure()
run: ./scripts/ci-diagnostics.sh

validate-spm-visionos:
name: Validate SPM Static visionOS
runs-on: macos-14
runs-on: macos-15
needs: [files-changed, assemble-xcframework-variant]
# Run the job only for PRs with related changes or non-PR events.
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
Expand All @@ -210,6 +213,7 @@ jobs:
uses: ./.github/actions/prepare-package.swift
with:
is-pr: ${{ github.event_name == 'pull_request' }}
- run: ./scripts/ci-select-xcode.sh 16.4
- run: set -o pipefail &&xcodebuild build -scheme visionOS-SPM -sdk xros -destination 'generic/platform=xros' | tee raw-build-output-spm-visionOS.log | xcbeautify
working-directory: Samples/visionOS-SPM
- name: Run CI Diagnostics
Expand Down Expand Up @@ -288,15 +292,16 @@ jobs:
job_release:
runs-on: ubuntu-latest
name: "Release New Version"
needs: [
files-changed,
validate-xcframework,
validate-spm,
validate-spm-dynamic,
swift-build,
duplication-tests,
app-metrics,
]
needs:
[
files-changed,
validate-xcframework,
validate-spm,
validate-spm-dynamic,
swift-build,
duplication-tests,
app-metrics,
]
if: ${{ github.event_name == 'workflow_dispatch' }}
steps:
- name: Get auth token
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
- Change `value` and `type` of `SentryException` to be nullable (#6563)
- Change the default trace context status to "ok" instead of "undefined" (#6611)
- Remove `getHash` from SentryDsn (#6605)
- The precompiled XCFramework is now built with Xcode 16. To submit to the App Store, [Apple now requires Xcode 16](https://developer.apple.com/news/upcoming-requirements/?id=02212025a).
If you need a precompiled XCFramework built with Xcode 15, continue using Sentry SDK 8.x.x.

### Features

Expand Down
Loading