From a25bcb0e7622aaa5e25167470ef190fbc5e82090 Mon Sep 17 00:00:00 2001 From: victorrhgap Date: Tue, 24 Mar 2026 20:14:47 -0600 Subject: [PATCH] fix(ci): macOS build aarch64-only, drop x86_64 cross-compile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cross-compiling x86_64 from aarch64 fails on openssl-sys (no cross pkg-config). Apple Silicon only — Intel Macs use Rosetta 2. cc --- .github/workflows/release-macos.yml | 31 ++++++----------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 708a48795..104e0fdf8 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -13,16 +13,8 @@ on: jobs: build-macos: - strategy: - matrix: - include: - - runner: macos-latest - target: aarch64-apple-darwin - arch: aarch64 - - runner: macos-latest - target: x86_64-apple-darwin - arch: x86_64 - runs-on: ${{ matrix.runner }} + # Apple Silicon only — Intel Macs run via Rosetta 2 + runs-on: macos-latest permissions: contents: write steps: @@ -86,7 +78,7 @@ jobs: - name: Setup Rust uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.target }} + targets: aarch64-apple-darwin - name: Rust cache uses: Swatinem/rust-cache@v2 @@ -97,29 +89,18 @@ jobs: run: npm ci - name: Build DMG - run: npm run tauri build -- --target ${{ matrix.target }} --bundles dmg + run: npm run tauri build -- --target aarch64-apple-darwin --bundles dmg - name: Collect artifacts - id: artifacts - env: - VERSION: ${{ steps.release.outputs.version }} - ARCH: ${{ matrix.arch }} run: | mkdir -p dist - cp -v src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg dist/ || true - # Rename with arch for clarity - for f in dist/*.dmg; do - if [[ -f "$f" && ! "$f" =~ "_${ARCH}" ]]; then - base=$(basename "$f" .dmg) - mv "$f" "dist/${base}_${ARCH}.dmg" - fi - done + cp -v src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg dist/ || true ls -la dist - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: qbz-macos-${{ matrix.arch }} + name: qbz-macos-aarch64 path: dist/* - name: Publish GitHub Release Assets