diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index c28f2656a..157c2df72 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -200,36 +200,31 @@ jobs: target: x86_64-pc-windows-msvc, os: windows-latest, runner: 'cargo', - command: 'test', - toolchain: '1.77.2' + command: 'test' } - { target: x86_64-unknown-linux-gnu, os: ubuntu-22.04, runner: 'cargo', - command: 'test', - toolchain: '1.77.2' + command: 'test' } - { target: aarch64-apple-darwin, os: macos-latest, runner: 'cargo', - command: 'test', - toolchain: '1.77.2' + command: 'test' } - { target: aarch64-apple-ios, os: macos-latest, runner: 'cargo', - command: 'build', - toolchain: '1.77.2' + command: 'build' } - { target: aarch64-linux-android, os: ubuntu-latest, runner: 'cross', - command: 'build --verbose', - toolchain: 'stable' + command: 'build --verbose' } runs-on: ${{ matrix.platform.os }} @@ -243,21 +238,30 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@1.85 with: - toolchain: ${{ matrix.platform.toolchain }} targets: ${{ matrix.platform.target }} - uses: Swatinem/rust-cache@v2 with: key: cache-${{ matrix.package }}-${{ matrix.platform.target }} + - run: cargo fetch + - name: install cross if: ${{ matrix.platform.runner == 'cross' }} run: cargo +stable install cross --git https://github.com/cross-rs/cross - name: test ${{ matrix.package }} - if: matrix.package != 'tauri-plugin-http' + if: matrix.package == 'tauri-plugin-secure-storage' + run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets + + - uses: dtolnay/rust-toolchain@1.77.2 + with: + targets: ${{ matrix.platform.target }} + + - name: test ${{ matrix.package }} + if: matrix.package != 'tauri-plugin-http' && matrix.package != 'tauri-plugin-secure-storage' run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --all-features - name: test ${{ matrix.package }}