Skip to content

Commit 9bf50ad

Browse files
authored
Merge branch 'master' into sig/add-debugid-inject
2 parents 74b27e4 + 0686ecc commit 9bf50ad

33 files changed

Lines changed: 469 additions & 315 deletions

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
- For external contributors: [CONTRIBUTING.md](https://github.com/getsentry/sentry-cli/blob/master/CONTRIBUTING.md), [Sentry SDK development docs](https://develop.sentry.dev/sdk/), [Discord community](https://discord.gg/Ww9hbqr)
1515
-->
1616

17-
18-
17+
### Legal Boilerplate
18+
Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.

.github/workflows/CLAUDE.md

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

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-24.04
1818
steps:
1919
- name: Checkout Repository
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
2121

2222
- name: Audit dependencies
2323
uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # 2.0.0

.github/workflows/build.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
image: messense/rust-musl-cross:${{ matrix.container }}
3232

3333
steps:
34-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
34+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
3535

3636
- name: Add Rustup Target
3737
run: |
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: macos-14
6868

6969
steps:
70-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
70+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
7171

7272
- name: Add Rustup Target
7373
run: rustup target add ${{ matrix.target }}
@@ -86,7 +86,7 @@ jobs:
8686
- name: Cache x86_64 OpenSSL
8787
if: matrix.arch == 'x86_64'
8888
id: cache-openssl-x86
89-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # 5.0.1
89+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # 5.0.2
9090
with:
9191
path: ${{ env.X86_64_APPLE_DARWIN_OPENSSL_DIR }}
9292
key: openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }}
@@ -154,7 +154,7 @@ jobs:
154154

155155
steps:
156156
- name: Checkout repository
157-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
157+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
158158

159159
- name: Install `rcodesign`
160160
run: |
@@ -218,7 +218,7 @@ jobs:
218218
runs-on: windows-2022
219219

220220
steps:
221-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
221+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
222222

223223
# When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
224224
# This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
@@ -250,9 +250,9 @@ jobs:
250250
needs: [linux, macos, macos_universal, windows]
251251

252252
steps:
253-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
253+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
254254

255-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # 6.1.0
255+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # 6.2.0
256256
with:
257257
node-version: '20.10.0'
258258

@@ -283,10 +283,10 @@ jobs:
283283
name: python (base)
284284
runs-on: ubuntu-24.04
285285
steps:
286-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
286+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
287287
- name: Add Rustup Target
288288
run: rustup target add x86_64-unknown-linux-musl
289-
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
289+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # 6.2.0
290290
with:
291291
python-version: '3.11'
292292
- run: python3 -m pip install build && python3 -m build
@@ -301,8 +301,8 @@ jobs:
301301
runs-on: ubuntu-24.04
302302
needs: [linux, sign-macos-binaries, windows, python-base]
303303
steps:
304-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
305-
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
304+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
305+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # 6.2.0
306306
with:
307307
python-version: '3.11'
308308
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
@@ -327,8 +327,8 @@ jobs:
327327
runs-on: ubuntu-24.04
328328
needs: [linux, sign-macos-binaries, windows]
329329
steps:
330-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
331-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # 6.1.0
330+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
331+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # 6.2.0
332332
with:
333333
node-version: '20.10.0'
334334
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
@@ -379,7 +379,7 @@ jobs:
379379
contents: read
380380
packages: write
381381
steps:
382-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
382+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
383383

384384
- name: Set up Docker Buildx
385385
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # 3.12.0

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
if: ${{ github.event_name == 'pull_request' }}
4848
steps:
4949
- name: Run Danger
50-
uses: getsentry/github-workflows/danger@13be9bec4ec5cd67061b747972b996e9c80f4f3b # 3.1.0
50+
uses: getsentry/github-workflows/danger@95603f4efe938315ff0dd427a1f2bb40b1889a92 # 3.2.0
5151

5252
required:
5353
name: Check required jobs

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333

3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
36+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
3737

3838
# Initializes the CodeQL tools for scanning.
3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # 4.31.10
40+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 4.32.0
4141
with:
4242
languages: ${{ matrix.language }}
4343
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +48,7 @@ jobs:
4848
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4949
# If this step fails, then you should remove it and run the build manually (see below)
5050
- name: Autobuild
51-
uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # 4.31.10
51+
uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 4.32.0
5252

5353
# ℹ️ Command-line programs to run using the OS shell.
5454
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -59,4 +59,4 @@ jobs:
5959
# make bootstrap
6060
# make release
6161
- name: Perform CodeQL Analysis
62-
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # 4.31.10
62+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 4.32.0

.github/workflows/lint.yml

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

4040
steps:
4141
- name: Checkout Repository
42-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
42+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
4343

4444
- name: Setup Rust Toolchain
4545
run: |
@@ -67,7 +67,7 @@ jobs:
6767
- name: Cache x86_64 OpenSSL
6868
if: matrix.target == 'x86_64-apple-darwin'
6969
id: cache-openssl-x86
70-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # 5.0.1
70+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # 5.0.2
7171
with:
7272
path: ${{ env.X86_64_APPLE_DARWIN_OPENSSL_DIR }}
7373
key: openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
with:
2828
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2929
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
30-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
30+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
3131
with:
3232
token: ${{ steps.token.outputs.token }}
3333
fetch-depth: 0
3434
- name: Prepare release
35-
uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2.19.0
35+
uses: getsentry/craft@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # v2.20.0
3636
env:
3737
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
3838
with:

.github/workflows/rust-toolchain-update.yml

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

1818
steps:
1919
- name: Checkout Repository
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
2121
with:
2222
token: ${{ secrets.GITHUB_TOKEN }}
2323

.github/workflows/swift-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: macos-15
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
1717
- name: Run tests
1818
working-directory: apple-catalog-parsing/native/swift/AssetCatalogParser
1919
run: swift test

0 commit comments

Comments
 (0)