Merge remote-tracking branch 'upstream/master'

.craft.yml

@@ -91,6 +91,9 @@ targets:
  checksums:
  - algorithm: sha256
  format: hex
+ - name: pypi
+ - name: sentry-pypi
+ internalPypiRepo: getsentry/pypi
 requireNames:
  - /^sentry-cli-Darwin-x86_64$/
  - /^sentry-cli-Darwin-arm64$/
@@ -102,3 +105,4 @@ requireNames:
  - /^sentry-cli-Windows-i686.exe$/
  - /^sentry-cli-Windows-x86_64.exe$/
  - /^sentry_cli-.*.tar.gz$/
+ - /^sentry_cli-.*.whl$/

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,97 @@
+name: 🐞 Bug Report
+description: Report a bug in this repo
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ To help us understand and resolve your issue, please provide the following information:
+
+ ## Environment
+ - type: input
+ id: cli-version
+ attributes:
+ label: CLI Version
+ description: In which version(s) of the CLI did you encounter the issue?
+ validations:
+ required: true
+ - type: checkboxes
+ id: os
+ attributes:
+ label: Operating System and Architecture
+ description: On which operating system(s) and architecture(s) did you encounter the issue? Please select all that apply.
+ options:
+ - label: macOS (arm64)
+ - label: macOS (x86_64)
+ - label: Linux (i686)
+ - label: Linux (x86_64)
+ - label: Linux (armv7)
+ - label: Linux (aarch64)
+ - label: Windows (i686)
+ - label: Windows (x86_64)
+ validations:
+ required: true
+ - type: input
+ id: os-version
+ attributes:
+ label: Operating System Version
+ description: Which version of the operating system are you using?
+ placeholder: e.g. macOS 14.0.0, Ubuntu 20.04, or Windows 10
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: |
+ ## Reproduction Steps
+ - type: input
+ attributes:
+ label: Link to reproduction repository
+ description: Please link to a repository that demonstrates the issue, if possible. Providing this information will help us help you faster!
+ - type: input
+ attributes:
+ label: CLI Command
+ description: What command did you run when you encountered the issue? (if applicable)
+ placeholder: sentry-cli <command> [options] --log-level=debug
+ - type: textarea
+ attributes:
+ label: Exact Reproduction Steps
+ description: What are the **exact** steps you took to encounter the issue?
+ placeholder: |
+ For example:
+ 1. Clone the repository provided above
+ 2. Launch a terminal window inside the repository
+ 3. Install the dependencies with `npm install`
+ 4. Run the command provided above
+ Help us help you! Please be as specific as possible.
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: |
+ ## Results
+ - type: textarea
+ attributes:
+ label: Expected Results
+ description: What did you expect would happen when you ran the command?
+ placeholder: e.g. I expected the CLI to upload the source maps to Sentry and display a success message.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Actual Results
+ description: What actually happened when you ran the command?
+ placeholder: e.g. The CLI displayed an error message and exited with a non-zero status code.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Logs
+ description: |
+ Please provide the full log output from the CLI. If possible, run the CLI with `--log-level=debug`.
+ **Remember to remove any sensitive information!**
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: |
+ **Thank you for your report!** We will investigate the issue and respond as soon as possible.

.github/workflows/build.yml

@@ -87,7 +87,7 @@ jobs:
  runs-on: macos-latest
 
  steps:
- - uses: actions/download-artifact@v2
+ - uses: actions/download-artifact@v3
  with:
  name: ${{ github.sha }}
 
@@ -145,13 +145,12 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Use Node.js 16.x
- uses: actions/setup-node@v1
+ - uses: actions/setup-node@v1
  with:
- node-version: 16.x
+ node-version: '20.10.0'
 
  - name: Download compiled binaries
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v3
  with:
  name: ${{ github.sha }}
 

.github/workflows/ci.yml

@@ -17,30 +17,18 @@ jobs:
  name: Lint
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
- - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
- with:
- toolchain: stable
- profile: minimal
- components: clippy, rustfmt
- override: true
+ - name: Install Rust Toolchain
+ run: rustup toolchain install stable --profile minimal --component clippy --component rustfmt --no-self-update
 
- - uses: swatinem/rust-cache@81d053bdb0871dcd3f10763c8cc60d0adc41762b # pin@v1
- with:
- key: ${{ github.job }}
+ - uses: swatinem/rust-cache@v2
 
  - name: Run Rustfmt
- uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # pin@v1
- with:
- command: fmt
- args: --all -- --check
+ run: cargo fmt --all -- --check
 
  - name: Run Clippy
- uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # pin@v1
- with:
- command: clippy
- args: --workspace --all-features --tests -- -D clippy::all
+ run: cargo clippy --workspace --tests -- -D clippy::all
 
  test:
  strategy:
@@ -87,10 +75,11 @@ jobs:
  with:
  node-version: ${{ matrix.node-version }}
 
- - run: npm install
+ # We need to skip the fallback download because downloading will fail on release branches because the new version isn't available yet.
+ - run: SENTRYCLI_SKIP_DOWNLOAD=1 npm install
 
  # older node versions need an older nft
- - run: npm install @vercel/nft@0.22.1
+ - run: SENTRYCLI_SKIP_DOWNLOAD=1 npm install @vercel/nft@0.22.1
  if: matrix.node-version == '10.x' || matrix.node-version == '12.x'
 
  - run: npm test

.npmignore

@@ -5,7 +5,7 @@
 !package.json
 !README.md
 !LICENSE
-!bin
+!bin/sentry-cli
 !js
 !scripts/install.js
 !checksums.txt

.vscode/settings.json

@@ -6,7 +6,7 @@
  "editor.formatOnSave": true
  },
  "eslint.autoFixOnSave": true,
- "editor.tabSize": 2,
+ "editor.tabSize": 4,
  "editor.codeActionsOnSave": {
  "source.fixAll.eslint": true
  }