diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-01-19 13:38:37 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-01-19 15:16:01 +0100 |
| commit | dd58b315e2108f84e3a79b442189d3bcd72f9c49 (patch) | |
| tree | b10d52cdb5b4d30e3767ce1e46a3569f4847a037 /.github | |
| parent | 524f4f9f02931b35493e5b3679a584bf10ab35e3 (diff) | |
| download | mullvadvpn-dd58b315e2108f84e3a79b442189d3bcd72f9c49.tar.xz mullvadvpn-dd58b315e2108f84e3a79b442189d3bcd72f9c49.zip | |
Pin nightly toolchain version in cargo udeps workflow
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/rust-unused-dependencies.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/rustfmt.yml | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml index 3b5c3256ec..b59720b244 100644 --- a/.github/workflows/rust-unused-dependencies.yml +++ b/.github/workflows/rust-unused-dependencies.yml @@ -7,6 +7,8 @@ on: - '**/*.rs' - '**/Cargo.toml' workflow_dispatch: +env: + RUST_NIGHTLY_TOOLCHAIN: nightly-2023-01-13 jobs: prepare-containers: runs-on: ubuntu-latest @@ -41,7 +43,7 @@ jobs: run: git submodule update --init --depth=1 dist-assets/binaries - name: Install nightly Rust toolchain - run: rustup default nightly + run: rustup default $RUST_NIGHTLY_TOOLCHAIN - uses: taiki-e/install-action@v2 with: @@ -49,7 +51,7 @@ jobs: - name: Check for unused dependencies shell: bash - run: source env.sh && cargo +nightly udeps --workspace + run: source env.sh && cargo udeps --workspace cargo-udeps-android: needs: prepare-containers @@ -68,15 +70,15 @@ jobs: - name: Install nightly Rust toolchain run: | - rustup default nightly - rustup target add aarch64-linux-android --toolchain nightly + rustup default $RUST_NIGHTLY_TOOLCHAIN + rustup target add aarch64-linux-android - uses: taiki-e/install-action@v2 with: tool: cargo-udeps - name: Check for unused dependencies - run: cargo +nightly udeps --target aarch64-linux-android --package mullvad-jni + run: cargo udeps --target aarch64-linux-android --package mullvad-jni cargo-udeps: strategy: @@ -96,7 +98,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1.0.6 with: - toolchain: nightly + toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }} default: true profile: minimal @@ -105,4 +107,5 @@ jobs: tool: cargo-udeps - name: Check for unused dependencies - run: cargo +nightly udeps --workspace + shell: bash + run: cargo udeps --workspace diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index 2d6117d547..0ae5673aa5 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -7,6 +7,8 @@ on: - rustfmt.toml - '**/*.rs' workflow_dispatch: +env: + RUST_NIGHTLY_TOOLCHAIN: nightly-2023-01-13 jobs: check-formatting: runs-on: ubuntu-latest @@ -17,7 +19,7 @@ jobs: - name: Install nightly Rust uses: actions-rs/toolchain@v1.0.6 with: - toolchain: nightly + toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }} components: rustfmt default: true |