Skip to content

Commit d1851a8

Browse files
committed
Merge branch 'main' into feat/add-swift-log-integration
2 parents b096852 + 929c622 commit d1851a8

File tree

24 files changed

+80
-59
lines changed

24 files changed

+80
-59
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ body:
4040
options:
4141
- Swift Package Manager
4242
- CocoaPods
43-
- Carthage
4443
- Manually
4544
validations:
4645
required: true

.github/file-filters.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ run_test_cross_platform_for_prs: &run_test_cross_platform_for_prs
157157
- "scripts/ci-select-xcode.sh"
158158
- "scripts/ci-diagnostics.sh"
159159
- "scripts/ci-utils.sh"
160+
- "scripts/ci-ensure-runtime-loaded.sh"
160161

161162
# Build configuration
162163
- "Makefile"

.github/workflows/build-xcframework-variant-slices.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ jobs:
107107
env:
108108
GITHUB_WORKSPACE: ${{ github.workspace }}
109109
run: |
110-
find "$GITHUB_WORKSPACE/Carthage/archive" -name "Sentry.framework" -print0 | xargs -t0 rm -rf
111-
find "$GITHUB_WORKSPACE/Carthage/archive" -name "Sentry.framework.dSYM" -print0 | xargs -t0 rm -rf
110+
find "$GITHUB_WORKSPACE/XCFrameworkBuildPath/archive" -name "Sentry.framework" -print0 | xargs -t0 rm -rf
111+
find "$GITHUB_WORKSPACE/XCFrameworkBuildPath/archive" -name "Sentry.framework.dSYM" -print0 | xargs -t0 rm -rf
112112
shell: bash
113113

114114
# the upload action broke symlinks in the mac sdk slice's xcarchive
@@ -119,7 +119,7 @@ jobs:
119119
INPUT_SUFFIX: ${{ inputs.suffix }}
120120
MATRIX_SDK: ${{ matrix.sdk }}
121121
run: |
122-
ditto -c -k -X --rsrc --keepParent ${GITHUB_WORKSPACE}/Carthage/archive/${INPUT_NAME}${INPUT_SUFFIX}/${MATRIX_SDK}.xcarchive ${INPUT_NAME}${INPUT_SUFFIX}.xcarchive.zip
122+
ditto -c -k -X --rsrc --keepParent ${GITHUB_WORKSPACE}/XCFrameworkBuildPath/archive/${INPUT_NAME}${INPUT_SUFFIX}/${MATRIX_SDK}.xcarchive ${INPUT_NAME}${INPUT_SUFFIX}.xcarchive.zip
123123
shell: bash
124124

125125
- name: Upload xcarchive

.github/workflows/release-upload-xcframework.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/download-artifact@v6
3333
with:
3434
name: xcframeworks.zip
35-
path: Carthage/
35+
path: XCFrameworkBuildPath/
3636
github-token: ${{ secrets.GITHUB_TOKEN }}
3737
run-id: ${{ env.FRAMEWORK_RUN_ID }}
3838

@@ -44,4 +44,4 @@ jobs:
4444
if-no-files-found: error
4545
overwrite: true
4646
path: |
47-
${{github.workspace}}/Carthage/*.zip
47+
${{github.workspace}}/XCFrameworkBuildPath/*.zip

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ jobs:
121121
- uses: actions/download-artifact@v6
122122
with:
123123
pattern: xcframework-${{github.sha}}-sentry-static
124-
path: Carthage/
124+
path: XCFrameworkBuildPath/
125125
- uses: actions/download-artifact@v6
126126
with:
127127
pattern: xcframework-${{github.sha}}-sentry-swiftui
128-
path: Carthage/
128+
path: XCFrameworkBuildPath/
129129
- run: ./scripts/ci-select-xcode.sh 16.4
130130
- name: Unzip all XCFrameworks
131131
run: |
132-
find Carthage -name "*.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d Carthage
132+
find XCFrameworkBuildPath -name "*.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d XCFrameworkBuildPath
133133
- run: make build-xcframework-sample
134134
- name: Run CI Diagnostics
135135
if: failure()
@@ -289,8 +289,8 @@ jobs:
289289
- uses: actions/download-artifact@v6
290290
with:
291291
pattern: xcframework-${{github.sha}}-sentry-dynamic
292-
path: Carthage/
293-
- run: find Carthage -name "Sentry-Dynamic.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d Carthage
292+
path: XCFrameworkBuildPath/
293+
- run: find XCFrameworkBuildPath -name "Sentry-Dynamic.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d XCFrameworkBuildPath
294294
- name: Build test app with sentry
295295
run: bundle exec fastlane build_perf_test_app_sentry
296296
env:
@@ -342,7 +342,7 @@ jobs:
342342
with:
343343
pattern: xcframework-${{github.sha}}-*
344344
merge-multiple: true
345-
path: Carthage/
345+
path: XCFrameworkBuildPath/
346346

347347
- name: Archive XCFrameworks for Craft
348348
uses: actions/upload-artifact@v5
@@ -351,7 +351,7 @@ jobs:
351351
if-no-files-found: error
352352
overwrite: true
353353
path: |
354-
${{github.workspace}}/Carthage/*.zip
354+
${{github.workspace}}/XCFrameworkBuildPath/*.zip
355355
356356
# update-package-sha.sh uses this env variable to update Package.swift.
357357
# During release Craft calls bump.sh that uses update-package-sha.sh.

.github/workflows/test-cross-platform.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# Run the job only for PRs with related changes or non-PR events.
4040
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_test_cross_platform_for_prs == 'true'
4141
needs: files-changed
42-
runs-on: macos-15
42+
runs-on: ["ghcr.io/cirruslabs/macos-runner:sequoia", "runner_group_id:10"]
4343
# This job can take a while to run, so we set a timeout.
4444
timeout-minutes: 30
4545
steps:
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: Enable Corepack
6363
working-directory: sentry-react-native
64-
run: npm i -g corepack
64+
run: npm i -g corepack --force
6565

6666
- uses: actions/setup-node@v6
6767
with:
@@ -70,6 +70,13 @@ jobs:
7070
cache-dependency-path: sentry-react-native/yarn.lock
7171
- run: ./sentry-cocoa/scripts/ci-select-xcode.sh 16.4
7272

73+
- name: Ensure required runtime is loaded
74+
# Ideally we will not need this, but CI sometimes is failing to load some runtimes, this will ensure they are loaded
75+
timeout-minutes: 5 # 5 minutes timeout
76+
env:
77+
OS_VERSION: "18.4"
78+
run: ./sentry-cocoa/scripts/ci-ensure-runtime-loaded.sh --os-version "$OS_VERSION"
79+
7380
- name: Create simulator device for iOS 18.4
7481
run: ./sentry-cocoa/scripts/ci-create-simulator.sh --platform "iOS" --os-version "18.4" --device-name "iPhone 15 Pro"
7582

@@ -87,6 +94,17 @@ jobs:
8794
working-directory: sentry-react-native/packages/core/RNSentryCocoaTester
8895
run: sed -i '' "s/parallelizable = \"YES\"/parallelizable = \"NO\"/" RNSentryCocoaTester.xcodeproj/xcshareddata/xcschemes/RNSentryCocoaTester.xcscheme
8996

97+
- name: Change ruby to 3.3.10
98+
# We use the same ruby version used by Cirrus to install fastlane and other tools
99+
# see: https://github.com/cirruslabs/macos-image-templates/blob/9115ef25530497999073cdf0f5497a4d142e3256/templates/xcode.pkr.hcl#L235
100+
working-directory: sentry-react-native/packages/core/RNSentryCocoaTester
101+
run: |
102+
rbenv global 3.3.10
103+
104+
- name: Install cocoapods
105+
working-directory: sentry-react-native/packages/core/RNSentryCocoaTester
106+
run: gem install cocoapods
107+
90108
- name: Install App Pods
91109
working-directory: sentry-react-native/packages/core/RNSentryCocoaTester
92110
run: pod install

.github/workflows/ui-tests-common.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ jobs:
149149
uses: actions/download-artifact@v6
150150
with:
151151
name: xcframework-${{github.sha}}-sentry-static
152-
path: Carthage/
152+
path: XCFrameworkBuildPath/
153153

154154
- name: Unzip XCFramework
155155
if: ${{ inputs.needs_xcframework }}
156156
run: |
157-
unzip -o Carthage/Sentry.xcframework.zip -d Carthage/
157+
unzip -o XCFrameworkBuildPath/Sentry.xcframework.zip -d XCFrameworkBuildPath/
158158
159159
- name: Run Fastlane
160160
env:

.github/workflows/ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
ui-tests-swift6,
196196
ready-to-merge-gate,
197197
]
198-
name: UI Tests
198+
name: UI Tests - Check
199199
# This is necessary since a failed/skipped dependent job would cause this job to be skipped
200200
if: always()
201201
runs-on: ubuntu-latest

.github/workflows/version-bump-util.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ jobs:
7979
8080
- name: Create fake xcframework for update-package-sha.sh
8181
run: |
82-
mkdir -p Carthage
83-
echo "<FAKE STATIC ZIP>" > Carthage/Sentry.xcframework.zip
84-
echo "<FAKE DYNAMIC ZIP>" > Carthage/Sentry-Dynamic.xcframework.zip
85-
echo "<FAKE DYNAMIC WITH ARM64E ZIP>" > Carthage/Sentry-Dynamic-WithARM64e.xcframework.zip
86-
echo "<FAKE WITHOUT UIKIT OR APPKIT ZIP>" > Carthage/Sentry-WithoutUIKitOrAppKit.xcframework.zip
87-
echo "<FAKE WITHOUT UIKIT OR APPKIT WITH ARM64E ZIP>" > Carthage/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip
82+
mkdir -p XCFrameworkBuildPath
83+
echo "<FAKE STATIC ZIP>" > XCFrameworkBuildPath/Sentry.xcframework.zip
84+
echo "<FAKE DYNAMIC ZIP>" > XCFrameworkBuildPath/Sentry-Dynamic.xcframework.zip
85+
echo "<FAKE DYNAMIC WITH ARM64E ZIP>" > XCFrameworkBuildPath/Sentry-Dynamic-WithARM64e.xcframework.zip
86+
echo "<FAKE WITHOUT UIKIT OR APPKIT ZIP>" > XCFrameworkBuildPath/Sentry-WithoutUIKitOrAppKit.xcframework.zip
87+
echo "<FAKE WITHOUT UIKIT OR APPKIT WITH ARM64E ZIP>" > XCFrameworkBuildPath/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip
8888
8989
- name: Bump version
9090
run: ./scripts/bump.sh ${{ steps.generate-version-number.outputs.OLD_VERSION }} ${{ steps.generate-version-number.outputs.NEW_VERSION }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ playground.xcworkspace
4141
Packages
4242

4343
# Carthage
44+
# We don't use Carthage anymore, but we keep this folder to avoid uploading local files by mistake.
45+
# Will be removed in the future.
4446
Carthage/Build
4547
Carthage/Checkouts
4648
Carthage
@@ -116,3 +118,6 @@ analyzer
116118

117119
# Output of snapshot testing
118120
**/__Snapshots__
121+
122+
# Output folder for Sentry local builds
123+
XCFrameworkBuildPath/

0 commit comments

Comments
 (0)