diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index e6a5a6f..d0c7780 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -42,11 +42,6 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev libayatana-appindicator3-dev - - name: Install ARM64 toolchain (windows only) - if: startsWith(matrix.os, 'windows-') - run: | - rustup target add aarch64-pc-windows-msvc - - name: Get yarn cache dir path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" @@ -81,23 +76,6 @@ jobs: releaseDraft: true prerelease: true - - name: Tauri build arm64 (windows only) - if: startsWith(matrix.os, 'windows-') - uses: tauri-apps/tauri-action@0e558392ccadcb49bcc89e7df15a400e8f0c954d - # enable cache even though failed - # continue-on-error: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - with: - tagName: alpha - releaseName: "Clash Verge Alpha" - releaseBody: "Alpha Version" - releaseDraft: true - prerelease: true - args: --target aarch64-pc-windows-msvc - # - name: Portable Bundle # if: matrix.os == 'windows-latest' # run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68062c5..5e98135 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,6 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev libayatana-appindicator3-dev - - name: Install ARM64 toolchain (windows only) - if: startsWith(matrix.os, 'windows-') - run: | - rustup target add aarch64-pc-windows-msvc - - name: Get yarn cache dir path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" @@ -80,23 +75,6 @@ jobs: releaseDraft: false prerelease: true - - name: Tauri build arm64 (windows only) - if: startsWith(matrix.os, 'windows-') - uses: tauri-apps/tauri-action@0e558392ccadcb49bcc89e7df15a400e8f0c954d - # enable cache even though failed - # continue-on-error: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - with: - tagName: v__VERSION__ - releaseName: "Clash Verge v__VERSION__" - releaseBody: "More new features are now supported." - releaseDraft: false - prerelease: true - args: --target aarch64-pc-windows-msvc - - name: Portable Bundle if: matrix.os == 'windows-latest' # rebuild with env settings diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 116d96e..fee2df8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,10 +40,10 @@ jobs: profile: minimal override: true - # - name: Rust Cache - # uses: Swatinem/rust-cache@v1 - # with: - # working-directory: src-tauri + - name: Rust Cache + uses: Swatinem/rust-cache@v1 + with: + working-directory: src-tauri - name: Install Node uses: actions/setup-node@v1 @@ -55,14 +55,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev libayatana-appindicator3-dev - - - name: Install ARM64 toolchain (windows only) - if: startsWith(github.event.inputs.os, 'windows-') - run: | - rustup target add aarch64-pc-windows-msvc - rustup target list - - rm ./src-tauri/Cargo.lock - name: Get yarn cache dir path id: yarn-cache-dir-path @@ -82,19 +74,9 @@ jobs: yarn install --network-timeout 1000000 yarn run check - # - name: Tauri build - # uses: tauri-apps/tauri-action@0e558392ccadcb49bcc89e7df15a400e8f0c954d - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - # TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - - - name: Tauri build arm64 (windows only) - if: startsWith(github.event.inputs.os, 'windows-') + - name: Tauri build uses: tauri-apps/tauri-action@0e558392ccadcb49bcc89e7df15a400e8f0c954d env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - with: - args: --target aarch64-pc-windows-msvc