Skip to content

Commit f92cfa9

Browse files
author
getsentry-bot
committed
Merge branch 'release/8.53.0-alpha.0'
2 parents d637379 + 7b133ff commit f92cfa9

File tree

15 files changed

+78
-16
lines changed

15 files changed

+78
-16
lines changed

.github/last-release-runid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15470305097
1+
15872115030

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ jobs:
9090
build-spm:
9191
name: Build with SPM
9292
runs-on: macos-15
93+
# Don't run this on release branches, cause the SPM Package.swift points to the unreleased versions.
94+
if: startsWith(github.ref, 'refs/heads/release/') == false
9395
steps:
9496
- uses: actions/checkout@v4
9597
# Only watchOS is compiling with SPM so far, the rest of the targets need profiling support which is still a work in progress due to the ObjC++ usage
@@ -171,6 +173,7 @@ jobs:
171173
# The compiler only evaluates SentryAsyncSafeLogs that get printed based on the SENTRY_ASYNC_SAFE_LOG_LEVEL.
172174
# So if the level is set to error, which is the default, and a SENTRY_ASYNC_SAFE_LOG_DEBUG has a compiler error,
173175
# you only get the compiler error when setting the SENTRY_ASYNC_SAFE_LOG_LEVEL to SENTRY_ASYNC_SAFE_LOG_LEVEL_DEBUG or lower.
176+
174177
check-compiling-async-safe-logs:
175178
name: Check compiling Async Safe Logs
176179
runs-on: macos-15
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Upload XCFrameworks
2+
on:
3+
push:
4+
branches:
5+
- release/**
6+
7+
jobs:
8+
# Craft uses the Git commit hash to query GitHub Actions for artifacts
9+
# uploaded in a workflow run associated with that commit.
10+
#
11+
# To support this, we download the XCFramework already built and uploaded
12+
# in release.yml (triggered via workflow_dispatch), and reupload it here.
13+
# This associates it with the new commit in the release branch, which is
14+
# created by getsentry/action-prepare-release in release.yml.
15+
#
16+
# This is necessary because Swift Package Manager requires a checksum for
17+
# XCFrameworks, creating a chicken-and-egg problem: we need the XCFramework
18+
# to generate the checksum, but we also need the checksum to update Package.swift.
19+
#
20+
# The sequence is:
21+
# 1. Build the XCFrameworks in release.yml.
22+
# 2. getsentry/action-prepare-release updates Package.swift with the checksum.
23+
# 3. Upload the XCFrameworks again here so Craft can find it by commit.
24+
upload-xcframeworks:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v4
28+
29+
- name: Get Release workflow run ID
30+
run: echo "FRAMEWORK_RUN_ID=$(./scripts/xcframework-generated-run.sh)" >> $GITHUB_ENV
31+
32+
- uses: actions/download-artifact@v4
33+
with:
34+
name: xcframeworks.zip
35+
path: Carthage/
36+
github-token: ${{ secrets.GITHUB_TOKEN }}
37+
run-id: ${{ env.FRAMEWORK_RUN_ID }}
38+
39+
- name: Archive XCFrameworks for Craft
40+
uses: actions/upload-artifact@v4
41+
with:
42+
# Craft uses the git commit hash of the release branch to download the release artifacts.
43+
name: ${{ github.sha }}
44+
if-no-files-found: error
45+
overwrite: true
46+
path: |
47+
${{github.workspace}}/Carthage/*.zip

.github/workflows/release.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- ".github/workflows/build-xcframework.yml"
1717
- "scripts/build-xcframework-slice.sh"
1818
- "scripts/assemble-xcframework.sh"
19+
- ".github/workflows/release.yml"
1920
- ".github/workflows/build-xcframework-variant-slices.yml"
2021
- ".github/workflows/assemble-xcframework-variant.yml"
2122
- ".github/workflows/ui-tests-common.yml"
@@ -240,6 +241,8 @@ jobs:
240241
validate-spm,
241242
validate-spm-dynamic,
242243
swift-build,
244+
duplication-tests,
245+
app-metrics,
243246
]
244247
if: ${{ github.event_name == 'workflow_dispatch' }}
245248
steps:
@@ -261,6 +264,15 @@ jobs:
261264
merge-multiple: true
262265
path: Carthage/
263266

267+
- name: Archive XCFrameworks for Craft
268+
uses: actions/upload-artifact@v4
269+
with:
270+
name: xcframeworks.zip
271+
if-no-files-found: error
272+
overwrite: true
273+
path: |
274+
${{github.workspace}}/Carthage/*.zip
275+
264276
# update-package-sha.sh uses this env variable to update Package.swift.
265277
# During release Craft calls bump.sh that uses update-package-sha.sh.
266278
- run: export GITHUB_RUN_ID=${{ github.run_id }}

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## Unreleased
3+
## 8.53.0-alpha.0
44

55
### Features
66

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ var products: [Product] = [
1111
var targets: [Target] = [
1212
.binaryTarget(
1313
name: "Sentry",
14-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.52.1/Sentry.xcframework.zip",
15-
checksum: "48a6c6693148a3f9096108164eb938a931b964395fcf38e169383b9e4cffcfc5" //Sentry-Static
14+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.53.0-alpha.0/Sentry.xcframework.zip",
15+
checksum: "d1eadfaac4188bca46b461be4ef1ee87a341f9a36e8a3c313b5cc5f7a7fe9aa2" //Sentry-Static
1616
),
1717
.binaryTarget(
1818
name: "Sentry-Dynamic",
19-
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.52.1/Sentry-Dynamic.xcframework.zip",
20-
checksum: "b9d9054c65ee5ac0591c27826edddc54490a96c2a83dee25519cae0c1a593231" //Sentry-Dynamic
19+
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.53.0-alpha.0/Sentry-Dynamic.xcframework.zip",
20+
checksum: "66c6c4a23dc1c0f93f96ccdfe065de33824371bef55bcebca1851172dc7471c3" //Sentry-Dynamic
2121
),
2222
.target (
2323
name: "SentrySwiftUI",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
CURRENT_PROJECT_VERSION = 1
2-
MARKETING_VERSION = 8.52.1
2+
MARKETING_VERSION = 8.53.0

Sentry.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Sentry"
3-
s.version = "8.52.1"
3+
s.version = "8.53.0-alpha.0"
44
s.summary = "Sentry client for cocoa"
55
s.homepage = "https://github.com/getsentry/sentry-cocoa"
66
s.license = "mit"

SentryPrivate.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SentryPrivate"
3-
s.version = "8.52.1"
3+
s.version = "8.53.0-alpha.0"
44
s.summary = "Sentry Private Library."
55
s.homepage = "https://github.com/getsentry/sentry-cocoa"
66
s.license = "mit"

SentrySwiftUI.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SentrySwiftUI"
3-
s.version = "8.52.1"
3+
s.version = "8.53.0-alpha.0"
44
s.summary = "Sentry client for SwiftUI"
55
s.homepage = "https://github.com/getsentry/sentry-cocoa"
66
s.license = "mit"
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
1919
s.watchos.framework = 'WatchKit'
2020

2121
s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}"
22-
s.dependency 'Sentry/HybridSDK', "8.52.1"
22+
s.dependency 'Sentry/HybridSDK', "8.53.0-alpha.0"
2323
end

0 commit comments

Comments
 (0)