From 87f752528dd36f77f1c90f40c8b2b450d1431102 Mon Sep 17 00:00:00 2001 From: FTCHD <144691102+FTCHD@users.noreply.github.com> Date: Sun, 2 Feb 2025 14:30:25 +0200 Subject: [PATCH] update separated actions --- .github/workflows/release-linux.yml | 8 ++++++++ .github/workflows/release-macos.yml | 7 ++++++- .github/workflows/release-windows.yml | 6 ++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index 4c8e867..49044b3 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -24,6 +24,14 @@ jobs: node-version: lts/* cache: 'npm' + - name: install Rust stable + uses: dtolnay/rust-toolchain@stable + + - name: Rust cache + uses: swatinem/rust-cache@v2 + with: + workspaces: './src-tauri -> target' + - name: install dependencies (ubuntu only) run: | sudo apt-get update diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 777b810..043c902 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -13,8 +13,12 @@ jobs: include: - platform: 'macos-latest' args: '--target aarch64-apple-darwin' + arch: 'silicon' + type: 'aarch64' - platform: 'macos-latest' args: '--target x86_64-apple-darwin' + arch: 'silicon' + type: 'x86_64' runs-on: ${{ matrix.platform }} env: @@ -32,7 +36,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - targets: 'aarch64-apple-darwin,x86_64-apple-darwin' + targets: ${{ matrix.type == 'aarch64' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }} - name: Rust cache uses: swatinem/rust-cache@v2 @@ -52,6 +56,7 @@ jobs: security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain security default-keychain -s build.keychain security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain + security set-keychain-settings -t 3600 -u build.keychain security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain security find-identity -v -p codesigning build.keychain diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index d061b15..28cccac 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -12,11 +12,13 @@ jobs: matrix: include: - platform: 'windows-latest' - args: '' + args: '--target x86_64-pc-windows-msvc' arch: 'arm64' + type: 'x86_64' - platform: "windows-latest" args: "--target aarch64-pc-windows-msvc" arch: 'arm64' + type: 'aarch64' runs-on: ${{ matrix.platform }} steps: @@ -31,7 +33,7 @@ jobs: - name: install Rust stable uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.arch == 'arm64' && 'aarch64-pc-windows-msvc' || '' }} + targets: ${{ matrix.type == 'aarch64' && 'aarch64-pc-windows-msvc' || 'x86_64-pc-windows-msvc' }} - name: Rust cache uses: swatinem/rust-cache@v2