Skip to content

Commit bcf382b

Browse files
committed
Merge branch 'main' into ci/disable-danger-PR-changelog-check
2 parents ecc9da3 + bfe5319 commit bcf382b

File tree

122 files changed

+3373
-1717
lines changed

Some content is hidden

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

122 files changed

+3373
-1717
lines changed

.claude/skills

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.agents/skills

.generated.NoMobile.slnx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<File Path=".github/workflows/release.yml" />
3333
<File Path=".github/workflows/update-deps.yml" />
3434
<File Path=".github/workflows/vulnerabilities.yml" />
35+
<File Path=".github/workflows/playwright-blazor-wasm.yml" />
3536
</Folder>
3637
<Folder Name="/benchmarks/">
3738
<Project Path="benchmarks/Sentry.Benchmarks/Sentry.Benchmarks.csproj" />
@@ -179,5 +180,8 @@
179180
<Project Path="test/Sentry.Tests/Sentry.Tests.csproj" />
180181
<Project Path="test/Sentry.TrimTest/Sentry.TrimTest.csproj" />
181182
<Project Path="test/SingleFileTestApp/SingleFileTestApp.csproj" />
183+
<Project Path="test/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests.csproj" />
184+
<Project Path="test/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests.TestApp/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests.TestApp.csproj" />
185+
<Project Path="test/Sentry.AspNetCore.Blazor.WebAssembly.Tests/Sentry.AspNetCore.Blazor.WebAssembly.Tests.csproj" />
182186
</Folder>
183187
</Solution>

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,25 @@ body:
9393
validations:
9494
required: true
9595

96+
- type: dropdown
97+
id: other_error_monitoring
98+
attributes:
99+
description: Are you using any other error monitoring solution alongside Sentry?
100+
label: Other Error Monitoring Solution
101+
options:
102+
- "Yes"
103+
- "No"
104+
validations:
105+
required: true
106+
107+
- type: input
108+
id: other_error_monitoring_name
109+
attributes:
110+
label: Other Error Monitoring Solution Name
111+
description: If you're using another error monitoring solution side-by-side, please enter the name of the other solution.
112+
validations:
113+
required: false
114+
96115
- type: input
97116
id: sentry_sdk_version
98117
attributes:

.github/actions/buildnative/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
- name: Set Environment Variables
99
shell: bash
1010
run: |
11-
if [[ "$RUNNER_OS" == "macOS" ]]; then
11+
if [[ "$RUNNER_ARCH" == "ARM64" ]]; then
1212
echo "JAVA_HOME_11=$JAVA_HOME_11_ARM64" >> $GITHUB_ENV
1313
else
1414
echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV

.github/actions/environment/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ runs:
9292
sudo chmod -R a+rw /usr/share/dotnet
9393
9494
- name: Install .NET SDK
95-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
95+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
9696
with:
9797
global-json-file: global.json
9898
dotnet-version: |
@@ -102,7 +102,7 @@ runs:
102102
# .NET 5.0 does not support ARM64 on macOS
103103
- name: Install .NET 5.0 SDK
104104
if: ${{ runner.os != 'macOS' || runner.arch != 'ARM64' }}
105-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
105+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
106106
with:
107107
dotnet-version: 5.0.x
108108

.github/copilot-instructions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../AGENTS.md

.github/dependabot.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
version: 2
22
updates:
3+
- package-ecosystem: "dotnet-sdk"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 1
8+
39
- package-ecosystem: nuget
410
directory: "/samples"
511
schedule:
@@ -10,8 +16,8 @@ updates:
1016
directory: "/test"
1117
schedule:
1218
interval: weekly
13-
open-pull-requests-limit: 2
14-
19+
open-pull-requests-limit: 2
20+
1521
- package-ecosystem: "github-actions"
1622
directory: "/"
1723
schedule:

.github/workflows/alpine.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
username: ${{ github.actor }}
3232
password: ${{ secrets.GITHUB_TOKEN }}
3333

34-
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
34+
- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
3535
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
3636

37-
- uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
37+
- uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
3838
with:
3939
push: true
4040
platforms: linux/amd64,linux/arm64

.github/workflows/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
119119
- name: Cancel Previous Runs
120120
if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
121-
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
121+
uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
122122

123123
- name: Checkout
124124
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -197,7 +197,7 @@ jobs:
197197
enableCrossOsArchive: true
198198

199199
- name: Build Native Dependencies
200-
if: ${{ !matrix.container }}
200+
if: ${{ !matrix.container && !env.NO_MOBILE }}
201201
uses: ./.github/actions/buildnative
202202

203203
- name: Restore .NET Dependencies
@@ -209,7 +209,7 @@ jobs:
209209

210210
- name: Upload build logs
211211
if: ${{ always() }}
212-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
212+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
213213
with:
214214
name: ${{ matrix.rid }}-build-logs
215215
path: |
@@ -242,7 +242,7 @@ jobs:
242242

243243
- name: Upload build and test outputs
244244
if: failure()
245-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
245+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
246246
with:
247247
name: ${{ matrix.rid }}-verify-test-results
248248
path: "**/*.received.*"
@@ -252,7 +252,7 @@ jobs:
252252

253253
- name: Archive NuGet Packages
254254
if: env.CI_PUBLISHING_BUILD == 'true'
255-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
255+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
256256
with:
257257
name: ${{ github.sha }}
258258
if-no-files-found: error
@@ -274,7 +274,7 @@ jobs:
274274
275275
- name: Fetch NuGet Packages
276276
if: env.CI_PUBLISHING_BUILD == 'true'
277-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
277+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
278278
with:
279279
name: ${{ github.sha }}
280280
path: src
@@ -338,7 +338,7 @@ jobs:
338338

339339
- name: Upload logs
340340
if: ${{ always() }}
341-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
341+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
342342
with:
343343
name: ${{ runner.os }}-msbuild-logs
344344
path: |
@@ -372,10 +372,11 @@ jobs:
372372
uses: ./.github/actions/environment
373373

374374
- name: Build Native Dependencies
375+
if: ${{ !env.NO_MOBILE }}
375376
uses: ./.github/actions/buildnative
376377

377378
- name: Fetch NuGet Packages
378-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
379+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
379380
with:
380381
name: ${{ github.sha }}
381382
path: src

.github/workflows/changelog-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ permissions:
1515

1616
jobs:
1717
changelog-preview:
18-
uses: getsentry/craft/.github/workflows/changelog-preview.yml@5d154a7facb096e38889be2c6caf2fd23649aa92 # 2.21.3
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@013a7b2113c2cac0ff32d5180cfeaefc7c9ce5b6 # 2.24.1
1919
secrets: inherit

0 commit comments

Comments
 (0)