From 5f2ac77923634d4b60e2a085a71d9dc86bbf078a Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sun, 9 Nov 2025 18:38:59 +0800 Subject: [PATCH] chore: update Rust toolchain to version 1.91.0 in autobuild workflow fix: update Rust toolchain action to use master branch for consistency feat: add support for Windows ARM64 Gnullvm in development workflow refactor: remove Windows ARM64 Gnullvm support and ensure Rust target is added for the pinned toolchain feat: add Rust target installation step for pinned toolchain in autobuild workflow fix: remove unnecessary blank lines in autobuild workflow --- .github/workflows/autobuild.yml | 31 +++++++++++++++++++++++++++++-- .github/workflows/dev.yml | 14 +++++++++----- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d8be39757..0f978e8a3 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -145,7 +145,10 @@ jobs: uses: actions/checkout@v4 - name: Install Rust Stable - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@master + with: + toolchain: "1.91.0" + targets: ${{ matrix.target }} - name: Add Rust Target run: rustup target add ${{ matrix.target }} @@ -201,6 +204,13 @@ jobs: - name: Release ${{ env.TAG_CHANNEL }} Version run: pnpm release-version autobuild-latest + - name: Add Rust Target + run: | + # Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed + rustup target add ${{ matrix.target }} --toolchain 1.91.0 || rustup target add ${{ matrix.target }} + rustup target list --installed + echo "Rust target ${{ matrix.target }} installed." + - name: Tauri build for Windows-macOS-Linux uses: tauri-apps/tauri-action@v0 env: @@ -244,7 +254,10 @@ jobs: uses: actions/checkout@v4 - name: Install Rust Stable - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@master + with: + toolchain: "1.91.0" + targets: ${{ matrix.target }} - name: Add Rust Target run: rustup target add ${{ matrix.target }} @@ -334,6 +347,13 @@ jobs: gcc-arm-linux-gnueabihf \ g++-arm-linux-gnueabihf + - name: Add Rust Target + run: | + # Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed + rustup target add ${{ matrix.target }} --toolchain 1.91.0 || rustup target add ${{ matrix.target }} + rustup target list --installed + echo "Rust target ${{ matrix.target }} installed." + - name: Tauri Build for Linux run: | export PKG_CONFIG_ALLOW_CROSS=1 @@ -433,6 +453,13 @@ jobs: Remove-Item .\src-tauri\tauri.windows.conf.json Rename-Item .\src-tauri\webview2.${{ matrix.arch }}.json tauri.windows.conf.json + - name: Add Rust Target + run: | + # Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed + rustup target add ${{ matrix.target }} --toolchain 1.91.0 || rustup target add ${{ matrix.target }} + rustup target list --installed + echo "Rust target ${{ matrix.target }} installed." + - name: Tauri build for Windows id: build uses: tauri-apps/tauri-action@v0 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 336c5e422..e5ae26c32 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -74,11 +74,7 @@ jobs: - name: Install Rust Stable if: github.event.inputs[matrix.input] == 'true' - uses: dtolnay/rust-toolchain@stable - - - name: Add Rust Target - if: github.event.inputs[matrix.input] == 'true' - run: rustup target add ${{ matrix.target }} + uses: dtolnay/rust-toolchain@1.91.0 - name: Rust Cache if: github.event.inputs[matrix.input] == 'true' @@ -118,6 +114,14 @@ jobs: if: github.event.inputs[matrix.input] == 'true' run: pnpm release-version ${{ env.TAG_NAME }} + - name: Add Rust Target + if: github.event.inputs[matrix.input] == 'true' + run: | + # Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed + rustup target add ${{ matrix.target }} --toolchain 1.91.0 || rustup target add ${{ matrix.target }} + rustup target list --installed + echo "Rust target ${{ matrix.target }} installed." + - name: Tauri build if: github.event.inputs[matrix.input] == 'true' uses: tauri-apps/tauri-action@v0