summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-03-09 17:01:41 -0500
committerGitHub <noreply@github.com>2023-03-09 17:01:41 -0500
commit0da193882ef94b97331babcebe1316535e2926f0 (patch)
tree32cd548f3e990d72e11f32d94de2b937bd0cacf0
parent44e67df1cd637d46744e7471f68f8bc4d1680a0e (diff)
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.
-rw-r--r--.github/workflows/ci.generate.ts2
-rw-r--r--.github/workflows/ci.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index a3f915180..06d8e0a02 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 242e8d711..474da1deb 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