Skip to content

Commit 250ccd1

Browse files
Merge branch 'master' into szokeasaurusrex/bug-double-inject
2 parents 47ee423 + 1fd856c commit 250ccd1

107 files changed

Lines changed: 1752 additions & 1100 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.

.craft.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ targets:
9595
checksums:
9696
- algorithm: sha256
9797
format: hex
98+
- name: pypi
99+
- name: sentry-pypi
100+
internalPypiRepo: getsentry/pypi
98101
- name: docker
99102
id: Docker Hub (release)
100103
source: ghcr.io/getsentry/sentry-cli
@@ -115,3 +118,5 @@ requireNames:
115118
- /^sentry-cli-Windows-i686.exe$/
116119
- /^sentry-cli-Windows-x86_64.exe$/
117120
- /^sentry-cli-Windows-aarch64.exe$/
121+
- /^sentry_cli-.*.tar.gz$/
122+
- /^sentry_cli-.*.whl$/

.github/pull_request_template.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
### Description
2+
<!-- What changed and why? -->
3+
4+
### Issues
5+
<!--
6+
* resolves: #1234
7+
* resolves: LIN-1234
8+
-->
9+
10+
<!--
11+
#### Reminders
12+
- Add GH Issue ID _&_ Linear ID (if applicable)
13+
- PR title should use [conventional commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type) style (`feat:`, `fix:`, `ref:`, `meta:`)
14+
- 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)
15+
-->
16+
17+
18+

.github/workflows/audit.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Audit dependencies
2+
3+
permissions:
4+
issues: write
5+
checks: write
6+
7+
on:
8+
schedule:
9+
# Run weekly Monday morning
10+
- cron: "49 4 * * 1"
11+
12+
workflow_dispatch:
13+
14+
jobs:
15+
audit:
16+
name: Audit dependencies
17+
runs-on: ubuntu-24.04
18+
steps:
19+
- name: Checkout Repository
20+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
21+
22+
- name: Audit dependencies
23+
uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # 2.0.0
24+
with:
25+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,49 @@ jobs:
248248
path: '*.tgz'
249249
if-no-files-found: 'error'
250250

251+
python-base:
252+
name: python (base)
253+
runs-on: ubuntu-24.04
254+
steps:
255+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
256+
- name: Add Rustup Target
257+
run: rustup target add x86_64-unknown-linux-musl
258+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # 5.6.0
259+
with:
260+
python-version: '3.11'
261+
- run: python3 -m pip install build && python3 -m build
262+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
263+
with:
264+
name: python-base
265+
path: dist/*
266+
if-no-files-found: 'error'
267+
268+
python:
269+
name: python
270+
runs-on: ubuntu-24.04
271+
needs: [linux, sign-macos-binaries, windows, python-base]
272+
steps:
273+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
274+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # 5.6.0
275+
with:
276+
python-version: '3.11'
277+
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # 5.0.0
278+
with:
279+
pattern: artifact-bin-*
280+
merge-multiple: true
281+
path: binaries
282+
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # 5.0.0
283+
with:
284+
name: python-base
285+
merge-multiple: true
286+
path: python-base
287+
- run: scripts/wheels --binaries binaries --base python-base --dest dist
288+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
289+
with:
290+
name: artifact-pkg-python
291+
path: dist/*
292+
if-no-files-found: 'error'
293+
251294
npm-distributions:
252295
name: 'Build NPM distributions'
253296
runs-on: ubuntu-24.04
@@ -311,7 +354,7 @@ jobs:
311354
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # 3.11.1
312355

313356
- name: Login to GitHub Container Registry
314-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # 3.5.0
357+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
315358
with:
316359
registry: ghcr.io
317360
username: ${{ github.actor }}
@@ -335,7 +378,7 @@ jobs:
335378
packages: write
336379
steps:
337380
- name: Login to GitHub Container Registry
338-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # 3.5.0
381+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
339382
with:
340383
registry: ghcr.io
341384
username: ${{ github.actor }}
@@ -350,7 +393,7 @@ jobs:
350393
merge:
351394
name: Create Release Artifact
352395
runs-on: ubuntu-24.04
353-
needs: [linux, sign-macos-binaries, windows, npm-distributions, node]
396+
needs: [linux, sign-macos-binaries, windows, npm-distributions, node, python]
354397
steps:
355398
- uses: actions/upload-artifact/merge@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
356399
with:

.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@192325c86100d080feab897ff886c34abd4c83a3 # 3.30.3
40+
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # 3.30.5
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@192325c86100d080feab897ff886c34abd4c83a3 # 3.30.3
51+
uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # 3.30.5
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@192325c86100d080feab897ff886c34abd4c83a3 # 3.30.3
62+
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # 3.30.5

.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@184bdaa0721073962dff0199f1fb9940f07167d1 # 3.5.0
12+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.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@184bdaa0721073962dff0199f1fb9940f07167d1 # 3.5.0
12+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # 3.6.0
1313
with:
1414
registry: ghcr.io
1515
username: ${{ github.actor }}

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
"You know what they say. Fool me once, strike one, but fool me twice... strike three." — Michael Scott
44

5+
## 2.56.0
6+
7+
### Various fixes & improvements
8+
9+
- feat: auto-fetch head-ref from GitHub Actions in detached HEAD state (#2805) by @runningcode
10+
- feat: automatically fetch base SHA in GitHub Actions PR workflows (#2799) by @runningcode
11+
- feat(preprod): use deflated compression when creating the zip file (#2800) by @trevor-e
12+
- feat(preprod): make sure at least one app bundle is present for upload (#2795) by @trevor-e
13+
- feat(preprod): fail upload if app is missing Info.plist (#2793) by @trevor-e
14+
- feat: restore GitHub Actions base branch detection (#2792) by @runningcode
15+
- fix: lower log level for missing base ref detection (EME-369) (#2813) by @runningcode
16+
- fix: simplify debug logging for PR number detection (EME-362) (#2812) by @runningcode
17+
- fix: serialize VCS tests to prevent race conditions (EME-368) (#2811) by @runningcode
18+
- fix: Validate `SENTRY_RELEASE` environment variable (#2807) by @szokeasaurusrex
19+
- fix: use actual PR head SHA in GitHub Actions instead of merge commit (#2785) by @runningcode
20+
- fix: suppress warning messages in failing build upload tests (#2791) by @runningcode
21+
22+
523
## 2.55.0
624

725
### Various fixes & improvements

0 commit comments

Comments
 (0)