From 2e16551d2445968d9242e3ee2cf6752389fe12b8 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 9 Mar 2023 17:01:41 -0500 Subject: [PATCH] chore(ci): ensure Rust toolchain installation is based on rust-toolchain.toml (#18104) It seems like `dtolnay/rust-toolchain` does not want to support rust-toolchain.toml unfortunately and we had thought it did. --- .github/workflows/ci.generate.ts | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index a3f915180d..06d8e0a02a 100644 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -81,7 +81,7 @@ const submoduleStep = (submodule: string) => ({ }); const installRustStep = { - uses: "dtolnay/rust-toolchain@stable", + uses: "dsherret/rust-toolchain-file@v1", }; const installPythonSteps = [{ name: "Install Python", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 242e8d711d..474da1deb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: mkdir -p target/release tar --exclude=".git*" --exclude=target --exclude=third_party/prebuilt \ -czvf target/release/deno_src.tar.gz -C .. deno - - uses: dtolnay/rust-toolchain@stable + - uses: dsherret/rust-toolchain-file@v1 if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (steps.exit_early.outputs.EXIT_EARLY != ''true'')' - if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (steps.exit_early.outputs.EXIT_EARLY != ''true'' && (matrix.job == ''lint'' || matrix.job == ''test''))' name: Install Deno