Skip to content

Commit 5e451bc

Browse files
authored
Merge branch 'master' into lcian/feat/snapshots
2 parents ca0a938 + 466a2f0 commit 5e451bc

32 files changed

Lines changed: 545 additions & 214 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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@8b402f58fbc84540c8b491a91e594a4576fec3d7 # 5.0.2
89+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # 5.0.3
9090
with:
9191
path: ${{ env.X86_64_APPLE_DARWIN_OPENSSL_DIR }}
9292
key: openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }}
@@ -385,7 +385,7 @@ jobs:
385385
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # 3.12.0
386386

387387
- name: Login to GitHub Container Registry
388-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
388+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # 3.7.0
389389
with:
390390
registry: ghcr.io
391391
username: ${{ github.actor }}
@@ -409,7 +409,7 @@ jobs:
409409
packages: write
410410
steps:
411411
- name: Login to GitHub Container Registry
412-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
412+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # 3.7.0
413413
with:
414414
registry: ghcr.io
415415
username: ${{ github.actor }}

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
# Initializes the CodeQL tools for scanning.
3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 4.32.0
40+
uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # 4.32.2
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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 4.32.0
51+
uses: github/codeql-action/autobuild@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # 4.32.2
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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 4.32.0
62+
uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # 4.32.2

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@8b402f58fbc84540c8b491a91e594a4576fec3d7 # 5.0.2
70+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # 5.0.3
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-ghcr-latest-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Log in to GitHub Container Registry
12-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
12+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # 3.7.0
1313
with:
1414
registry: ghcr.io
1515
username: ${{ github.actor }}

.github/workflows/release-ghcr-version-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Log in to GitHub Container Registry
12-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
12+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # 3.7.0
1313
with:
1414
registry: ghcr.io
1515
username: ${{ github.actor }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
token: ${{ steps.token.outputs.token }}
3333
fetch-depth: 0
3434
- name: Prepare release
35-
uses: getsentry/craft@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # v2.20.0
35+
uses: getsentry/craft@63d1636bead951f6e034ed62c2a3610965fef010 # v2.21.2
3636
env:
3737
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
3838
with:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Cache x86_64 OpenSSL
6767
if: matrix.target == 'x86_64-apple-darwin'
6868
id: cache-openssl-x86
69-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # 5.0.2
69+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # 5.0.3
7070
with:
7171
path: ${{ env.X86_64_APPLE_DARWIN_OPENSSL_DIR }}
7272
key: openssl-x86_64-${{ runner.os }}-${{ steps.cache-date.outputs.month }}

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# Changelog
22

3-
## Unreleased
3+
## 3.2.2
4+
5+
### Fixes
6+
7+
- Updated `minimatch` dependency to fix a vulnerability ([#3153](https://github.com/getsentry/sentry-cli/pull/3153))
8+
9+
## 3.2.1
10+
11+
### Fixes
12+
13+
- The `dart-symbol-map upload` command now correctly resolves the organization from the auth token payload ([#3065](https://github.com/getsentry/sentry-cli/pull/3065)).
14+
- Retry DNS resolution failures for `sentry.io` requests to reduce intermittent failures for some users ([#3085](https://github.com/getsentry/sentry-cli/pull/3085))
15+
16+
## 3.2.0
417

518
### Features
619

CONTRIBUTING.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
# Adding new commands
2-
For new commands, it is recommended to use clap's [Derive API](https://docs.rs/clap/latest/clap/_derive/index.html).
3-
In contrast to the [Builder API](https://docs.rs/clap/latest/clap/_tutorial/index.html), the Derive API makes it:
4-
- Easier to read, write, and modify commands and arguments.
5-
- Easier to keep argument declaration and reading in sync.
6-
- Easier to reuse shared arguments.
7-
8-
An existing example of how to use the Derive API is the `send-metric` command.
9-
101
# Integration Tests
112

123
Integration tests are written using `trycmd` crate. Consult the docs in case you need to understand how it works https://docs.rs/trycmd/latest/trycmd/.

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)