From f00b0f0fbb4f69ea560aee3d5eff914e6d350ed3 Mon Sep 17 00:00:00 2001 From: Jamie Pine Date: Sat, 24 Jan 2026 14:15:43 -0800 Subject: [PATCH] Update GitHub workflows for core tests and release process - Commented out pull request trigger in core_tests.yml to simplify workflow. - Enhanced release.yml for ARM cross-compilation by adding APT configuration steps and removing redundant setup steps for Rust target installation. - Updated tauri commands in package.json to use the latest syntax for improved compatibility. --- .github/workflows/core_tests.yml | 4 ++-- .github/workflows/release.yml | 16 +++++++--------- apps/tauri/package.json | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 331ae6579..8e526e02a 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -3,8 +3,8 @@ name: Core Tests on: push: branches: ["main"] - pull_request: - branches: ["main"] + # pull_request: + # branches: ["main"] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ed873c82..0a9a05b7e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,6 +130,13 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} target: ${{ matrix.settings.target }} + - name: Configure APT for ARM cross-compilation + if: matrix.settings.target == 'aarch64-unknown-linux-gnu' + run: | + sudo dpkg --add-architecture arm64 + sudo sed -i 's|http://archive.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' /etc/apt/sources.list + sudo sed -i 's|http://security.ubuntu.com/ubuntu|http://ports.ubuntu.com/ubuntu-ports|g' /etc/apt/sources.list + - name: Install cross-compilation tools (ARM) if: matrix.settings.target == 'aarch64-unknown-linux-gnu' run: | @@ -143,7 +150,6 @@ jobs: - name: Install cross OpenSSL (ARM) if: matrix.settings.target == 'aarch64-unknown-linux-gnu' run: | - sudo dpkg --add-architecture arm64 sudo apt-get update sudo apt-get install -y pkg-config libssl-dev:arm64 @@ -232,11 +238,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Rust - uses: dtolnay/rust-toolchain@stable - with: - targets: ${{ matrix.settings.target }} - - name: Install Apple API key if: ${{ runner.os == 'macOS' }} run: | @@ -261,9 +262,6 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} target: ${{ matrix.settings.target }} - - name: Install target - run: rustup target add ${{ matrix.settings.target }} - - name: Setup Bun and dependencies uses: ./.github/actions/setup-bun with: diff --git a/apps/tauri/package.json b/apps/tauri/package.json index d13fae5a1..1aa4b5c94 100644 --- a/apps/tauri/package.json +++ b/apps/tauri/package.json @@ -14,10 +14,10 @@ "build:daemon:release": "cargo build --release --bin sd-daemon --manifest-path ../../Cargo.toml", "preview": "vite preview", "typecheck": "tsc -b", - "tauri": "bunx tauri", - "tauri:dev": "bunx tauri dev", - "tauri:dev:no-watch": "bunx tauri dev --no-watch", - "tauri:build": "bunx tauri build && ./scripts/fix-daemon-entitlements.sh ../../target/release/bundle/macos/Spacedrive.app || true" + "tauri": "tauri", + "tauri:dev": "tauri dev", + "tauri:dev:no-watch": "tauri dev --no-watch", + "tauri:build": "tauri build && ./scripts/fix-daemon-entitlements.sh ../../target/release/bundle/macos/Spacedrive.app || true" }, "dependencies": { "@phosphor-icons/react": "^2.1.0",