Skip to content

Commit 0b44ff6

Browse files
committed
Merge branch 'main' into chore/csharp-14.0
2 parents e396298 + a45876f commit 0b44ff6

File tree

21 files changed

+396
-190
lines changed

21 files changed

+396
-190
lines changed

.github/workflows/alpine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
packages: write
2424

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

2828
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2929
with:

.github/workflows/build.yml

Lines changed: 11 additions & 11 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

@@ -121,7 +121,7 @@ jobs:
121121
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
@@ -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
@@ -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,7 +306,7 @@ 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

@@ -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

@@ -381,7 +381,7 @@ jobs:
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
@@ -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/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
2828

2929
- name: Checkout repository
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
submodules: recursive
3333

3434
- name: Setup Environment
3535
uses: ./.github/actions/environment
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
38+
uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
3939
with:
4040
languages: csharp
4141

@@ -49,6 +49,6 @@ jobs:
4949
run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
5050

5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
52+
uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
5353
with:
5454
category: '/language:csharp'

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
danger:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: getsentry/github-workflows/danger@13be9bec4ec5cd67061b747972b996e9c80f4f3b # 3.1.0
11+
- uses: getsentry/github-workflows/danger@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0

.github/workflows/device-tests-android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
2828

2929
- name: Checkout
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
submodules: recursive
3333

@@ -80,7 +80,7 @@ jobs:
8080
sudo udevadm trigger --name-match=kvm
8181
8282
- name: Checkout
83-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
83+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8484
with:
8585
submodules: recursive
8686

@@ -121,13 +121,13 @@ jobs:
121121
uses: ./.github/actions/environment
122122

123123
- name: Select Java 17
124-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
124+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
125125
with:
126126
distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
127127
java-version: '17'
128128

129129
- name: Checkout github-workflows
130-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
130+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
131131
with:
132132
repository: getsentry/github-workflows
133133
ref: a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1

.github/workflows/device-tests-ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
2525

2626
- name: Checkout
27-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
submodules: recursive
3030

@@ -49,14 +49,14 @@ jobs:
4949
id: first-integration-test-run
5050
continue-on-error: true
5151
timeout-minutes: 40
52-
uses: getsentry/github-workflows/sentry-cli/integration-test@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
52+
uses: getsentry/github-workflows/sentry-cli/integration-test@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
5353
with:
5454
path: integration-test/ios.Tests.ps1
5555

5656
- name: Retry Integration Tests (if previous failed to run)
5757
if: steps.first-integration-test-run.outcome == 'failure'
5858
timeout-minutes: 40
59-
uses: getsentry/github-workflows/sentry-cli/integration-test@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
59+
uses: getsentry/github-workflows/sentry-cli/integration-test@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
6060
with:
6161
path: integration-test/ios.Tests.ps1
6262

.github/workflows/format-code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: macos-15
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919
with:
2020
submodules: recursive
2121

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
2727
- name: Check out current commit (${{ github.sha }})
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
with:
3030
token: ${{ steps.token.outputs.token }}
3131
fetch-depth: 0

.github/workflows/update-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: CLI
2525
path: scripts/update-cli.ps1
2626
steps:
27-
- uses: getsentry/github-workflows/updater@13be9bec4ec5cd67061b747972b996e9c80f4f3b # v3.1.0
27+
- uses: getsentry/github-workflows/updater@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
2828
with:
2929
name: ${{ matrix.name }}
3030
path: ${{ matrix.path }}

.github/workflows/vulnerabilities.yml

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

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818
with:
1919
submodules: recursive
2020

0 commit comments

Comments
 (0)