Merge remote-tracking branch 'origin/master' into preserve-xcarchive-zip-structure

Author: szokeasaurusrex

.github/workflows/ci.yml

@@ -18,22 +18,28 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-14, windows-2022]
-
-    name: Lint (${{ matrix.os }})
+        feature-args: ['', '-Funstable-mobile-app']
+        include:
+          - feature-args: ''
+            feature-suffix: ''
+          - feature-args: '-Funstable-mobile-app'
+            feature-suffix: ', mobile-app'
+
+    name: Lint (${{ matrix.os }}${{ matrix.feature-suffix }})
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
 
       - name: Install Rust Toolchain
         run: rustup toolchain install stable --profile minimal --component clippy --component rustfmt --no-self-update
 
-      - uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # 2.7.8
+      - uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
 
       - name: Run Rustfmt
         run: cargo fmt --all -- --check
 
       - name: Run Clippy
-        run: cargo clippy --workspace --tests
+        run: cargo clippy --workspace --tests ${{ matrix.feature-args }}
 
   lint:
     needs: lint-each-os
@@ -52,19 +58,25 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-14, windows-2022]
-
-    name: Test (${{ matrix.os }})
+        feature-args: ['', '-Funstable-mobile-app']
+        include:
+          - feature-args: ''
+            feature-suffix: ''
+          - feature-args: '-Funstable-mobile-app'
+            feature-suffix: ', mobile-app'
+
+    name: Test (${{ matrix.os }}${{ matrix.feature-suffix }})
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
 
-      - uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # 2.7.8
+      - uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
         with:
           key: ${{ github.job }}
 
       - name: Run Cargo Tests
-        run: cargo test --all
+        run: cargo test --all ${{ matrix.feature-args }}
 
   test_node:
     strategy:

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # 3.29.0
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # 3.29.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +48,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # 3.29.0
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # 3.29.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -59,4 +59,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # 3.29.0
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # 3.29.2

.gitignore

@@ -11,4 +11,5 @@ yarn-error.log
 /sentry-cli
 /sentry-cli.exe
 
-.vscode/
+.vscode/*
+!.vscode/settings.json

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "rust-analyzer.cargo.features": ["unstable-mobile-app"],
+    "rust-analyzer.cargo.noDefaultFeatures": false
+}

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 "You know what they say. Fool me once, strike one, but fool me twice... strike three." — Michael Scott
 
+## 2.47.0
+
+### Various fixes & improvements
+
+- ref: Exclude `mobile-app` command from release builds (#2582) by @szokeasaurusrex
+- feat(login): Improve error output for login errors (#2581) by @szokeasaurusrex
+- test(monitors): pass empty options to grep (#2562) by @lcian
+- feat(login): Warn when overwriting existing auth token (#2554) by @szokeasaurusrex
+- meta: Add .sentryclirc to gitignore (#2547) by @rbro112
+- build: Bump MSRV to 1.86
+
 ## 2.46.0
 
 ### Various fixes & improvements
@@ -21,11 +32,12 @@
 ## 2.45.0
 
 ### New feature
+
 - feat(sourcemaps): Multi-project sourcemaps upload (#2497) by @szokeasaurusrex
-   - Sourcemaps can now be uploaded to multiple projects at once by passing each project to the `sentry-cli sourcemaps upload` command, like so:
-     ```sh
-     sentry-cli sourcemaps upload -p project1 -p project2 /path/to/sourcemaps
-     ```
+  - Sourcemaps can now be uploaded to multiple projects at once by passing each project to the `sentry-cli sourcemaps upload` command, like so:
+    ```sh
+    sentry-cli sourcemaps upload -p project1 -p project2 /path/to/sourcemaps
+    ```
   - Note that users on old versions of self-hosted Sentry may need to upgrade their self-hosted server to a newer version to take advantage of multi-project uploads.
 
 ### Various fixes & improvements

Cargo.lock

@@ -2,7 +2,7 @@
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 build = "build.rs"
 name = "sentry-cli"
-version = "2.46.0"
+version = "2.47.0"
 edition = "2021"
 rust-version = "1.86"
 
@@ -11,6 +11,7 @@ rust-version = "1.86"
 [dependencies]
 anylog = "0.6.3"
 anyhow = { version = "1.0.69", features = ["backtrace"] }
+apple-catalog-parsing = { path = "apple-catalog-parsing", optional = true }
 backoff = "0.4.0"
 brotli2 = "0.3.2"
 bytecount = "0.6.3"
@@ -93,6 +94,10 @@ default = []
 managed = []
 with_crash_reporting = []
 
+# Feature flag for the mobile-app command, as it is still under development.
+# CI tests run against this flag, but we don't include it in release builds.
+unstable-mobile-app = ["apple-catalog-parsing"]
+
 [workspace.lints.clippy]
 allow-attributes = "warn"
 unnecessary-wraps = "warn"

Cargo.toml

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cli-darwin",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "The darwin distribution of the Sentry CLI binary.",
   "repository": "https://github.com/getsentry/sentry-cli",
   "license": "BSD-3-Clause",

npm-binary-distributions/darwin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cli-linux-arm",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "The linux arm distribution of the Sentry CLI binary.",
   "repository": "https://github.com/getsentry/sentry-cli",
   "license": "BSD-3-Clause",

npm-binary-distributions/linux-arm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cli-linux-arm64",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "The linux arm64 distribution of the Sentry CLI binary.",
   "repository": "https://github.com/getsentry/sentry-cli",
   "license": "BSD-3-Clause",