PR feedback

Author: noahsmartin

.github/workflows/test.yml

@@ -15,13 +15,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-14, windows-2022]
+        os: [ubuntu-24.04, macos-14, windows-2022, macos-14-large]
         feature-args: ['', '-Funstable-mobile-app']
         include:
           - os: ubuntu-24.04
             display-os: Linux
           - os: macos-14
             display-os: macOS
+          - os: macos-14-large
+            display-os: macOS (Intel)
           - os: windows-2022
             display-os: Windows
           - feature-args: ''
@@ -41,75 +43,3 @@ jobs:
 
       - name: Run Cargo Tests
         run: cargo test --workspace ${{ matrix.feature-args }}
-
-  cross-platform-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-14, macos-14-large]
-        feature-args: ['', '-Funstable-mobile-app']
-        include:
-          - feature-args: ''
-            feature-suffix: ''
-          - feature-args: '-Funstable-mobile-app'
-            feature-suffix: ' (-Funstable-mobile-app)'
-
-    name: Build on macOS 14, Test on macOS 13${{ matrix.feature-suffix }}
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-
-      - name: Cache Dependencies
-        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
-
-      - name: Build on macOS 14
-        run: cargo build --release --workspace ${{ matrix.feature-args }}
-
-      - name: Upload Build Artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
-        with:
-          name: sentry-cli-macos14-build${{ matrix.feature-suffix }}-${{ matrix.os }}
-          path: target/release/sentry-cli
-          retention-days: 1
-
-  cross-platform-test-runner:
-    needs: cross-platform-test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-13, macos-13-xlarge, macos-15-large]
-        feature-args: ['', '-Funstable-mobile-app']
-        include:
-          - os: macos-13
-            base-os: macos-14-large
-          - os: macos-13-xlarge
-            base-os: macos-14
-          - os: macos-15-large
-            base-os: macos-14-large
-          - feature-args: ''
-            feature-suffix: ''
-          - feature-args: '-Funstable-mobile-app'
-            feature-suffix: ' (-Funstable-mobile-app)'
-
-    name: Run macOS ${{ matrix.os }} ${{ matrix.feature-suffix }}
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-
-      - name: Download Build Artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
-        with:
-          name: sentry-cli-macos14-build${{ matrix.feature-suffix }}-${{ matrix.base-os }}
-          path: ./bin
-
-      - name: Make Binary Executable
-        run: chmod +x ./bin/sentry-cli
-
-      - name: Test Binary Compatibility
-        run: |
-          # Ensure the cli runs
-          ./bin/sentry-cli --help

apple-catalog-parsing/build.rs

@@ -94,8 +94,4 @@ fn main() {
     println!(
         "cargo:rustc-link-search={developer_dir_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx"
     );
-
-    let lib_dir = "/usr/lib/swift";
-    println!("cargo:rustc-link-arg=-Wl,-rpath");
-    println!("cargo:rustc-link-arg=-Wl,{lib_dir}");
 }

build.rs

@@ -29,11 +29,5 @@ fn main() -> Result<(), Box<dyn Error>> {
     writeln!(f, "pub const USER_AGENT: &str = \"sentry-cli/{arch}\";")?;
     println!("cargo:rerun-if-changed=build.rs\n");
 
-    // if platform == "darwin" {
-    //     let lib_dir = "/usr/lib/swift";
-    //     println!("cargo:rustc-link-arg=-Wl,-rpath");
-    //     println!("cargo:rustc-link-arg=-Wl,{lib_dir}");
-    // }
-
     Ok(())
 }

src/commands/mobile_app/upload.rs

@@ -33,7 +33,7 @@ use crate::utils::vcs;
 pub fn make_command(command: Command) -> Command {
     #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
     const HELP_TEXT: &str = "The path to the mobile app files to upload. Supported files include Apk, Aab, XCArchive, and IPA.";
-    #[cfg(any(not(target_os = "macos"), not(target_arch = "aarch64")))]
+    #[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
     const HELP_TEXT: &str = "The path to the mobile app files to upload. Supported files include Apk, Aab, and XCArchive.";
     command
         .about("[EXPERIMENTAL] Upload mobile app files to a project.")
@@ -233,7 +233,7 @@ fn validate_is_mobile_app(path: &Path, bytes: &[u8]) -> Result<()> {
     debug!("File format validation failed");
     #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
     let format_list = "APK, AAB, XCArchive, or IPA";
-    #[cfg(any(not(target_os = "macos"), not(target_arch = "aarch64")))]
+    #[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
     let format_list = "APK, AAB, or XCArchive";
 
     Err(anyhow!(

tests/integration/mobile_app/upload.rs

@@ -4,13 +4,13 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::LazyLock;
 use std::{fs, str};
 
-#[cfg(target_os = "macos")]
+#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
 #[test]
 fn command_mobile_app_upload_help() {
     TestManager::new().register_trycmd_test("mobile_app/mobile_app-upload-help-macos.trycmd");
 }
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 #[test]
 fn command_mobile_app_upload_help() {
     TestManager::new().register_trycmd_test("mobile_app/mobile_app-upload-help-not-macos.trycmd");
@@ -181,7 +181,7 @@ fn command_mobile_app_upload_apk_chunked() {
 }
 
 #[test]
-#[cfg(target_os = "macos")]
+#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
 /// This test simulates a full chunk upload for an IPA file (with only one chunk).
 /// It verifies that the Sentry CLI makes the expected API calls to the chunk upload endpoint
 /// and that the data sent to the chunk upload endpoint is exactly as expected.