From 34dd15ead79a7559c2976d6cb61654ff732f1fc9 Mon Sep 17 00:00:00 2001 From: Pierre Jacquier Date: Thu, 7 Sep 2023 19:19:58 -0400 Subject: [PATCH] Add macOS universal release builds (#408) * Add macOS universal release builds Fixes #397 * Change macos to universal-apple-darwin * Upload universal-apple-darwin/release * Clean up * Clean up --- .github/workflows/ci.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c97246e9..096072242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,31 +129,22 @@ jobs: - name: Fix format run: yarn fmt - # This will do intel silicon on mac - - name: Build the app for the current platform (no upload) - uses: tauri-apps/tauri-action@v0 - env: - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - - name: install apple silicon target mac if: matrix.os == 'macos-latest' run: | rustup target add aarch64-apple-darwin - # this will do apple silicon on mac - name: Build the app for the current platform (no upload) uses: tauri-apps/tauri-action@v0 - if: matrix.os == 'macos-latest' env: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: - args: --target universal-apple-darwin + args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} - uses: actions/upload-artifact@v3 with: - path: src-tauri/target/release/bundle/*/* + path: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin/release/bundle/*/*' || 'src-tauri/target/release/bundle/*/*' }} publish-apps-release: @@ -188,6 +179,10 @@ jobs: "signature": $darwin_sig, "url": $darwin_url }, + "darwin-aarch64": { + "signature": $darwin_sig, + "url": $darwin_url + }, "linux-x86_64": { "signature": $linux_sig, "url": $linux_url