Skip to content

Commit 8e8282f

Browse files
denrasedenrase
committed
Merge branch 'denrase/swift-log-sentry-poc' into denrase/swifty-beaver-integration
# Conflicts: # Sentry.xcodeproj/project.pbxproj
2 parents 6888774 + f376191 commit 8e8282f

File tree

178 files changed

+2124
-1362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+2124
-1362
lines changed

‎.github/file-filters.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ run_api_stability_for_prs: &run_api_stability_for_prs
7272
- "scripts/update-api.sh"
7373
- "scripts/ci-select-xcode.sh"
7474
- "scripts/ci-diagnostics.sh"
75+
- "scripts/ci-utils.sh"
7576

7677
# API files
7778
- "sdk_api.json"
@@ -97,6 +98,7 @@ run_integration_test_for_prs: &run_integration_test_for_prs
9798
# Scripts
9899
- "scripts/ci-select-xcode.sh"
99100
- "scripts/ci-diagnostics.sh"
101+
- "scripts/ci-utils.sh"
100102

101103
# Build configuration
102104
- "fastlane/**"
@@ -119,6 +121,7 @@ run_benchmarking_for_prs: &run_benchmarking_for_prs
119121
# Scripts
120122
- "scripts/ci-select-xcode.sh"
121123
- "scripts/ci-diagnostics.sh"
124+
- "scripts/ci-utils.sh"
122125
- "scripts/build-xcframework-slice.sh"
123126
- "scripts/assemble-xcframework.sh"
124127

@@ -147,6 +150,7 @@ run_test_cross_platform_for_prs: &run_test_cross_platform_for_prs
147150
# Scripts
148151
- "scripts/ci-select-xcode.sh"
149152
- "scripts/ci-diagnostics.sh"
153+
- "scripts/ci-utils.sh"
150154

151155
# Build configuration
152156
- "Makefile"
@@ -171,6 +175,7 @@ run_lint_clang_formatting_for_prs: &run_lint_clang_formatting_for_prs
171175

172176
# Scripts
173177
- "scripts/ci-diagnostics.sh"
178+
- "scripts/ci-utils.sh"
174179

175180
# Build configuration
176181
- "Makefile"
@@ -185,6 +190,7 @@ run_objc_conversion_analysis_for_prs: &run_objc_conversion_analysis_for_prs
185190

186191
# Scripts
187192
- "scripts/ci-diagnostics.sh"
193+
- "scripts/ci-utils.sh"
188194

189195
# Build configuration
190196
- "Brewfile*"
@@ -201,6 +207,7 @@ run_auto_update_tools_for_prs: &run_auto_update_tools_for_prs
201207
# Scripts
202208
- "scripts/check-tooling-versions.sh"
203209
- "scripts/ci-diagnostics.sh"
210+
- "scripts/ci-utils.sh"
204211
- "scripts/update-tooling-versions.sh"
205212

206213
# Build configuration
@@ -219,6 +226,7 @@ run_lint_cocoapods_specs_for_prs: &run_lint_cocoapods_specs_for_prs
219226
# Scripts
220227
- "scripts/ci-select-xcode.sh"
221228
- "scripts/ci-diagnostics.sh"
229+
- "scripts/ci-utils.sh"
222230
- "scripts/pod-lib-lint.sh"
223231

224232
# Project files
@@ -246,6 +254,7 @@ run_release_for_prs: &run_release_for_prs
246254
# Scripts
247255
- "scripts/ci-select-xcode.sh"
248256
- "scripts/ci-diagnostics.sh"
257+
- "scripts/ci-utils.sh"
249258
- "scripts/build-xcframework-slice.sh"
250259
- "scripts/build-xcframework-local.sh"
251260
- "scripts/assemble-xcframework.sh"
@@ -281,6 +290,7 @@ run_lint_swift_formatting_for_prs: &run_lint_swift_formatting_for_prs
281290

282291
# Scripts
283292
- "scripts/ci-diagnostics.sh"
293+
- "scripts/ci-utils.sh"
284294

285295
# Build configuration
286296
- "Makefile"
@@ -318,6 +328,7 @@ run_lint_xcode_analyze_for_prs: &run_lint_xcode_analyze_for_prs
318328
# Scripts
319329
- "scripts/ci-select-xcode.sh"
320330
- "scripts/ci-diagnostics.sh"
331+
- "scripts/ci-utils.sh"
321332

322333
# Project files
323334
- "Sentry.xcodeproj/**"
@@ -345,6 +356,7 @@ run_build_for_prs: &run_build_for_prs
345356
- "scripts/ci-diagnostics.sh"
346357
- "scripts/sentry-xcodebuild.sh"
347358
- "scripts/check-uikit-linkage.sh"
359+
- "scripts/ci-utils.sh"
348360

349361
# Build configuration
350362
- "fastlane/**"
@@ -367,6 +379,7 @@ run_testflight_for_pushes: &run_testflight_for_pushes
367379
# Scripts
368380
- "scripts/ci-select-xcode.sh"
369381
- "scripts/ci-diagnostics.sh"
382+
- "scripts/ci-utils.sh"
370383

371384
# Build configuration
372385
- "fastlane/**"
@@ -385,6 +398,7 @@ run_codeql_analysis_for_prs: &run_codeql_analysis_for_prs
385398

386399
# Scripts
387400
- "scripts/ci-diagnostics.sh"
401+
- "scripts/ci-utils.sh"
388402

389403
# Build configuration
390404
- "Makefile"
@@ -430,6 +444,7 @@ run_ui_tests_for_prs: &run_ui_tests_for_prs
430444
- "scripts/build-xcframework-slice.sh"
431445
- "scripts/assemble-xcframework.sh"
432446
- "scripts/ci-diagnostics.sh"
447+
- "scripts/ci-utils.sh"
433448

434449
# Test plans
435450
- "**/*.xctestplan"
@@ -464,6 +479,7 @@ run_ui_tests_critical_for_prs: &run_ui_tests_critical_for_prs
464479
- "scripts/ci-boot-simulator.sh"
465480
- "scripts/ci-select-xcode.sh"
466481
- "scripts/ci-diagnostics.sh"
482+
- "scripts/ci-utils.sh"
467483

468484
# Build configuration
469485
- "fastlane/**"
@@ -487,6 +503,7 @@ run_lint_swiftlint_for_prs: &run_lint_swiftlint_for_prs
487503
# Scripts
488504
- "scripts/ci-select-xcode.sh"
489505
- "scripts/ci-diagnostics.sh"
506+
- "scripts/ci-utils.sh"
490507

491508
# Project files
492509
- "Sentry.xcodeproj/**"

‎.github/workflows/assemble-xcframework-variant.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Download ${{inputs.variant-id}} Slices
135135
if: steps.cache-xcframework.outputs.cache-hit != 'true'
136-
uses: actions/download-artifact@v5
136+
uses: actions/download-artifact@v6
137137
with:
138138
pattern: xcframework-${{inputs.variant-id}}-slice-*
139139
path: xcframework-slices

‎.github/workflows/benchmarking.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
suite: ["High-end device", "Mid-range device", "Low-end device"]
118118
steps:
119119
- uses: actions/checkout@v5
120-
- uses: actions/download-artifact@v5
120+
- uses: actions/download-artifact@v6
121121
with:
122122
name: DerivedData-Xcode
123123
- run: npm install -g [email protected]

‎.github/workflows/create-issue-for-unreferenced-pr.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ jobs:
6868
return;
6969
}
7070
71+
// Check if there's already an issue created by this automation for this PR
72+
// Search for issues that mention this PR and were created by github-actions bot
73+
const existingIssuesResponse = await github.rest.search.issuesAndPullRequests({
74+
q: `repo:${context.repo.owner}/${context.repo.repo} is:issue is:open author:app/github-actions "${prUrl}" in:title in:body`,
75+
});
76+
77+
if (existingIssuesResponse.data.total_count > 0) {
78+
const existingIssue = existingIssuesResponse.data.items[0];
79+
console.log(`An issue (#${existingIssue.number}) already exists for PR #${prNumber}, skipping creation.`);
80+
return;
81+
}
82+
7183
core.warning(`PR #${prNumber} does not have an issue reference. Creating a new issue so it can be tracked in Linear.`);
7284
7385
// Construct the title and body for the new issue

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Get Release workflow run ID
3030
run: echo "FRAMEWORK_RUN_ID=$(./scripts/xcframework-generated-run.sh)" >> $GITHUB_ENV
3131

32-
- uses: actions/download-artifact@v5
32+
- uses: actions/download-artifact@v6
3333
with:
3434
name: xcframeworks.zip
3535
path: Carthage/

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ jobs:
111111
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
112112
steps:
113113
- uses: actions/checkout@v5
114-
- uses: actions/download-artifact@v5
114+
- uses: actions/download-artifact@v6
115115
with:
116116
pattern: xcframework-${{github.sha}}-sentry-static
117117
path: Carthage/
118-
- uses: actions/download-artifact@v5
118+
- uses: actions/download-artifact@v6
119119
with:
120120
pattern: xcframework-${{github.sha}}-sentry-swiftui
121121
path: Carthage/
@@ -136,7 +136,7 @@ jobs:
136136
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
137137
steps:
138138
- uses: actions/checkout@v5
139-
- uses: actions/download-artifact@v5
139+
- uses: actions/download-artifact@v6
140140
with:
141141
pattern: xcframework-${{github.sha}}-*
142142
merge-multiple: true
@@ -158,7 +158,7 @@ jobs:
158158
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
159159
steps:
160160
- uses: actions/checkout@v5
161-
- uses: actions/download-artifact@v5
161+
- uses: actions/download-artifact@v6
162162
with:
163163
pattern: xcframework-${{github.sha}}-*
164164
merge-multiple: true
@@ -180,7 +180,7 @@ jobs:
180180
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
181181
steps:
182182
- uses: actions/checkout@v5
183-
- uses: actions/download-artifact@v5
183+
- uses: actions/download-artifact@v6
184184
with:
185185
pattern: xcframework-${{github.sha}}-*
186186
merge-multiple: true
@@ -201,7 +201,7 @@ jobs:
201201
if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
202202
steps:
203203
- uses: actions/checkout@v5
204-
- uses: actions/download-artifact@v5
204+
- uses: actions/download-artifact@v6
205205
with:
206206
pattern: xcframework-${{github.sha}}-*
207207
merge-multiple: true
@@ -259,7 +259,7 @@ jobs:
259259
MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
260260
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
261261
MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
262-
- uses: actions/download-artifact@v5
262+
- uses: actions/download-artifact@v6
263263
with:
264264
pattern: xcframework-${{github.sha}}-sentry-dynamic
265265
path: Carthage/
@@ -310,7 +310,7 @@ jobs:
310310
token: ${{ steps.token.outputs.token }}
311311
fetch-depth: 0
312312

313-
- uses: actions/download-artifact@v5
313+
- uses: actions/download-artifact@v6
314314
with:
315315
pattern: xcframework-${{github.sha}}-*
316316
merge-multiple: true

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141

142142
steps:
143143
- uses: actions/checkout@v5
144-
- uses: actions/download-artifact@v5
144+
- uses: actions/download-artifact@v6
145145
with:
146146
name: test-server
147147

@@ -439,7 +439,7 @@ jobs:
439439
--result-bundle results.xcresult
440440
441441
- name: Publish Test Report
442-
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5.6.2
442+
uses: mikepenz/action-junit-report@5b7ee5a21e8674b695313d769f3cbdfd5d4d53a4 # v6.0.0
443443
if: always()
444444
with:
445445
report_paths: "build/reports/junit.xml"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126

127127
- name: Download XCFramework
128128
if: ${{ inputs.needs_xcframework }}
129-
uses: actions/download-artifact@v5
129+
uses: actions/download-artifact@v6
130130
with:
131131
name: xcframework-${{github.sha}}-sentry-static
132132
path: Carthage/
@@ -149,7 +149,7 @@ jobs:
149149
fi
150150
151151
- name: Publish Test Report
152-
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5.6.2
152+
uses: mikepenz/action-junit-report@5b7ee5a21e8674b695313d769f3cbdfd5d4d53a4 # v6.0.0
153153
if: always()
154154
with:
155155
report_paths: build/reports/*junit.xml

‎.github/workflows/ui-tests-critical.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,6 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
include:
55-
# iOS 16 - Use macOS-26 with Xcode 26.1 to download iOS 16.4 runtime (latest toolkit)
56-
# macOS 13 was sunset in November 2025, so we moved to macOS-26 with latest Xcode for iOS 16 testing
57-
- name: iOS 16
58-
platform:
59-
runs-on: macos-26
60-
xcode: "26.1"
61-
test-destination-os: "16.4"
62-
install_platforms: true
63-
platform: "iOS"
64-
create_device: true
65-
device: "iPhone 14 Pro"
66-
6755
# macos-14 iOS 17 not included due to the XCUIServerNotFound errors causing flaky tests
6856

6957
# iOS 18 - Use pre-installed iOS 18.4 runtime on macOS-15

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,6 @@ jobs:
7979
fail-fast: false
8080
matrix:
8181
include:
82-
# iOS 16 - Use macOS-26 with Xcode 26.1 to download iOS 16.4 runtime (latest toolkit)
83-
- name: iOS 16
84-
runs-on: macos-26
85-
xcode: "26.1"
86-
test-destination-os: "16.4"
87-
install_platforms: true
88-
platform: "iOS"
89-
create_device: true
90-
device: iPhone 14 Pro
91-
9282
# iOS 17 - Use pre-installed iOS 17.5 runtime on macOS-14 with Xcode 15.4
9383
- name: iOS 17
9484
runs-on: macos-14

0 commit comments

Comments
 (0)