Skip to content

Commit e126a63

Browse files
jpnurmijpnurmi
committed
Merge remote-tracking branch 'upstream/main' into feat/android-signal-handler-strategy
2 parents 543b3e3 + 863ee6a commit e126a63

81 files changed

Lines changed: 1026 additions & 465 deletions

File tree

Some content is hidden

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

‎.claude/settings.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(find:*)",
5+
"Bash(ls:*)",
6+
"Bash(git:*)",
7+
"Bash(git status:*)",
8+
"Bash(git log:*)",
9+
"Bash(git diff:*)",
10+
"Bash(git show:*)",
11+
"Bash(git branch:*)",
12+
"Bash(git remote:*)",
13+
"Bash(git tag:*)",
14+
"Bash(git stash list:*)",
15+
"Bash(git rev-parse:*)",
16+
"Bash(gh pr view:*)",
17+
"Bash(gh pr list:*)",
18+
"Bash(gh pr checks:*)",
19+
"Bash(gh pr diff:*)",
20+
"Bash(gh issue view:*)",
21+
"Bash(gh issue list:*)",
22+
"Bash(gh run view:*)",
23+
"Bash(gh run list:*)",
24+
"Bash(gh run logs:*)",
25+
"Bash(gh repo view:*)",
26+
"WebFetch(domain:github.com)",
27+
"WebFetch(domain:docs.sentry.io)",
28+
"WebFetch(domain:develop.sentry.dev)",
29+
"Bash(grep:*)",
30+
"Bash(mv:*)"
31+
],
32+
"deny": []
33+
}
34+
}

‎.generated.NoMobile.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A8A9
217217
scripts\build-sentry-cocoa.sh = scripts\build-sentry-cocoa.sh
218218
scripts\update-project-xml.ps1 = scripts\update-project-xml.ps1
219219
scripts\build-sentry-native.ps1 = scripts\build-sentry-native.ps1
220-
scripts\ios-simulator-utils.ps1 = scripts\ios-simulator-utils.ps1
221220
scripts\commit-formatted-code.sh = scripts\commit-formatted-code.sh
222221
scripts\accept-verifier-changes.ps1 = scripts\accept-verifier-changes.ps1
223222
scripts\generate-cocoa-bindings.ps1 = scripts\generate-cocoa-bindings.ps1
224223
scripts\generate-solution-filters.ps1 = scripts\generate-solution-filters.ps1
225224
scripts\generate-solution-filters-config.yaml = scripts\generate-solution-filters-config.yaml
225+
scripts\device-test-utils.ps1 = scripts\device-test-utils.ps1
226+
scripts\install-libssl1.sh = scripts\install-libssl1.sh
227+
scripts\patch-cocoa-bindings.cs = scripts\patch-cocoa-bindings.cs
226228
EndProjectSection
227229
EndProject
228230
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{EC6ADE8A-E557-4848-8F03-519039830B5F}"
231+
ProjectSection(SolutionItems) = preProject
232+
.github\release.yml = .github\release.yml
233+
EndProjectSection
229234
EndProject
230235
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{BFF081D8-7CC0-4069-99F5-5CA0D70B56AB}"
231236
ProjectSection(SolutionItems) = preProject
@@ -239,6 +244,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
239244
.github\workflows\vulnerabilities.yml = .github\workflows\vulnerabilities.yml
240245
.github\workflows\device-tests-ios.yml = .github\workflows\device-tests-ios.yml
241246
.github\workflows\device-tests-android.yml = .github\workflows\device-tests-android.yml
247+
.github\workflows\changelog-preview.yml = .github\workflows\changelog-preview.yml
242248
EndProjectSection
243249
EndProject
244250
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "actions", "actions", "{5D50D425-244F-4B79-B9F5-21D26DD52DC1}"

‎.github/actions/environment/action.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runs:
4848
- name: Pin the Xcode Version
4949
if: runner.os == 'macOS'
5050
shell: bash
51-
run: sudo xcode-select --switch /Applications/Xcode_26.0.1.app
51+
run: sudo xcode-select --switch /Applications/Xcode_26.2.app
5252

5353
# Java 17 is needed for Android SDK setup step
5454
- name: Install Java 17
@@ -97,7 +97,7 @@ runs:
9797
global-json-file: global.json
9898
dotnet-version: |
9999
8.0.x
100-
9.0.304
100+
9.0.310
101101
102102
# .NET 5.0 does not support ARM64 on macOS
103103
- name: Install .NET 5.0 SDK
@@ -109,7 +109,13 @@ runs:
109109
- name: Install .NET Workloads
110110
shell: bash
111111
run: |
112+
set -euo pipefail
112113
pwd
113114
dotnet workload restore \
114115
--temp-dir "${{ runner.temp }}" \
115116
--skip-sign-check
117+
dotnet workload restore test/AndroidTestApp/AndroidTestApp.csproj \
118+
--temp-dir "${{ runner.temp }}" \
119+
--skip-sign-check
120+
# Restore the Android test app explicitly to ensure runtime packs are available
121+
dotnet restore test/AndroidTestApp/AndroidTestApp.csproj -r android-x64 --nologo || true

‎.github/release.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
changelog:
2+
policy: auto
3+
exclude:
4+
labels:
5+
- skip-changelog
6+
authors:
7+
- dependabot
8+
categories:
9+
- title: Breaking Changes 🛠
10+
labels:
11+
- "*"
12+
commit_patterns:
13+
- "^(?<type>\\w+(?:\\((?<scope>[^)]+)\\))?!:\\s*)"
14+
- title: Features ✨
15+
labels:
16+
- "*"
17+
commit_patterns:
18+
- "^feat(?:\\([^\\)]+\\))?:\\s+"
19+
- title: Fixes 🐛
20+
labels:
21+
- "*"
22+
commit_patterns:
23+
- "^(?:fix|bugfix)(?:\\([^\\)]+\\))?:\\s+"
24+
- title: Dependencies ⬆️
25+
labels:
26+
- "*"
27+
commit_patterns:
28+
- "^chore\\(deps(?:-dev)?\\):\\s+"

‎.github/workflows/alpine.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
packages: write
2424

2525
steps:
26-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727

28-
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
28+
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
2929
with:
3030
registry: ghcr.io
3131
username: ${{ github.actor }}
3232
password: ${{ secrets.GITHUB_TOKEN }}
3333

3434
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
35-
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
35+
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
3636

3737
- uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
3838
with:

‎.github/workflows/build.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
curl -sSL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/.github/alpine/setup-node.sh | sudo bash /dev/stdin
4949
5050
- name: Checkout
51-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
51+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5252

5353
- run: git submodule update --init modules/sentry-native
5454

@@ -58,7 +58,7 @@ jobs:
5858
uses: ./.github/actions/install-zstd
5959

6060
- id: cache
61-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
61+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
6262
with:
6363
path: src/Sentry/Platforms/Native/sentry-native
6464
key: sentry-native-${{ matrix.rid }}-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -118,10 +118,10 @@ jobs:
118118
119119
- name: Cancel Previous Runs
120120
if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
121-
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
121+
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
122122

123123
- name: Checkout
124-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
124+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
125125
with:
126126
submodules: recursive
127127
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -140,47 +140,47 @@ jobs:
140140

141141
- name: Download sentry-native (linux-x64)
142142
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-x64') }}
143-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
143+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
144144
with:
145145
path: src/Sentry/Platforms/Native/sentry-native
146146
key: sentry-native-linux-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
147147
fail-on-cache-miss: true
148148

149149
- name: Download sentry-native (linux-arm64)
150150
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-arm64') }}
151-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
151+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
152152
with:
153153
path: src/Sentry/Platforms/Native/sentry-native
154154
key: sentry-native-linux-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
155155
fail-on-cache-miss: true
156156

157157
- name: Download sentry-native (linux-musl-x64)
158158
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-musl-x64') }}
159-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
159+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
160160
with:
161161
path: src/Sentry/Platforms/Native/sentry-native
162162
key: sentry-native-linux-musl-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
163163
fail-on-cache-miss: true
164164

165165
- name: Download sentry-native (linux-musl-arm64)
166166
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-musl-arm64') }}
167-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
167+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
168168
with:
169169
path: src/Sentry/Platforms/Native/sentry-native
170170
key: sentry-native-linux-musl-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
171171
fail-on-cache-miss: true
172172

173173
- name: Download sentry-native (macos)
174174
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'macos') }}
175-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
175+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
176176
with:
177177
path: src/Sentry/Platforms/Native/sentry-native
178178
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
179179
fail-on-cache-miss: true
180180

181181
- name: Download sentry-native (win-x64)
182182
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'win-x64') }}
183-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
183+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
184184
with:
185185
path: src/Sentry/Platforms/Native/sentry-native
186186
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -189,7 +189,7 @@ jobs:
189189

190190
- name: Download sentry-native (win-arm64)
191191
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'win-arm64') }}
192-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
192+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
193193
with:
194194
path: src/Sentry/Platforms/Native/sentry-native
195195
key: sentry-native-win-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -262,7 +262,7 @@ jobs:
262262
263263
- name: Sparse checkout
264264
if: env.CI_PUBLISHING_BUILD == 'true'
265-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
265+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
266266
with:
267267
# We only check out what is absolutely necessary to reduce a chance of local files impacting
268268
# integration tests (nuget.config etc.)... But we need the root Directory.Build.props calculate
@@ -274,7 +274,7 @@ jobs:
274274
275275
- name: Fetch NuGet Packages
276276
if: env.CI_PUBLISHING_BUILD == 'true'
277-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
277+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
278278
with:
279279
name: ${{ github.sha }}
280280
path: src
@@ -284,7 +284,7 @@ jobs:
284284
# if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
285285
# TODO: Re-enable once we have resolved https://github.com/getsentry/sentry-dotnet/issues/4788
286286
if: ${{ (matrix.rid != 'linux-musl-x64') }}
287-
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
287+
uses: getsentry/github-workflows/sentry-cli/integration-test@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
288288
with:
289289
path: integration-test
290290

@@ -293,7 +293,7 @@ jobs:
293293
# # by passing it as parameter to aot.Tests.ps1 via an environment variable
294294
# - name: Integration test (musl)
295295
# if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
296-
# uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
296+
# uses: getsentry/github-workflows/sentry-cli/integration-test@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
297297
# env:
298298
# ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
299299
# with:
@@ -306,12 +306,12 @@ jobs:
306306

307307
steps:
308308
- name: Checkout
309-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
309+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
310310
with:
311311
submodules: recursive
312312

313313
- name: Download sentry-native (win-x64)
314-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
314+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
315315
with:
316316
path: src/Sentry/Platforms/Native/sentry-native
317317
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -332,7 +332,7 @@ jobs:
332332
run: msbuild Sentry-CI-Build-Windows.slnf -t:Restore,Build,Pack -p:Configuration=Release --nologo -v:minimal -flp:logfile=msbuild.log -p:CopyLocalLockFileAssemblies=true -bl:msbuild.binlog
333333

334334
- name: Test MSBuild
335-
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
335+
uses: getsentry/github-workflows/sentry-cli/integration-test@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
336336
with:
337337
path: integration-test/msbuild.Tests.ps1
338338

@@ -364,7 +364,7 @@ jobs:
364364

365365
steps:
366366
- name: Checkout
367-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
367+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
368368
with:
369369
submodules: recursive
370370

@@ -375,13 +375,13 @@ jobs:
375375
uses: ./.github/actions/buildnative
376376

377377
- name: Fetch NuGet Packages
378-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
378+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
379379
with:
380380
name: ${{ github.sha }}
381381
path: src
382382

383383
- name: Test AOT
384-
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
384+
uses: getsentry/github-workflows/sentry-cli/integration-test@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
385385
env:
386386
RuntimeIdentifier: ${{ matrix.rid }}
387387
with:
@@ -394,7 +394,7 @@ jobs:
394394

395395
steps:
396396
- name: Checkout
397-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
397+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
398398
with:
399399
submodules: recursive
400400
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -404,7 +404,7 @@ jobs:
404404
run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
405405

406406
- name: Download sentry-native (macos)
407-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
407+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
408408
with:
409409
path: src/Sentry/Platforms/Native/sentry-native
410410
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -433,7 +433,7 @@ jobs:
433433
if: ${{ !startsWith(github.ref_name, 'release/') }}
434434

435435
steps:
436-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
436+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
437437
with:
438438
submodules: recursive
439439

‎.github/workflows/changelog-preview.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Changelog Preview
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
8+
- edited
9+
- labeled
10+
- unlabeled
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
statuses: write
15+
16+
jobs:
17+
changelog-preview:
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@v2
19+
secrets: inherit

0 commit comments

Comments
 (0)