mirror of
https://github.com/denoland/deno.git
synced 2025-03-04 01:44:26 -05:00
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.
This commit is contained in:
parent
44e67df1cd
commit
0da193882e
2 changed files with 2 additions and 2 deletions
2
.github/workflows/ci.generate.ts
vendored
2
.github/workflows/ci.generate.ts
vendored
|
@ -81,7 +81,7 @@ const submoduleStep = (submodule: string) => ({
|
||||||
});
|
});
|
||||||
|
|
||||||
const installRustStep = {
|
const installRustStep = {
|
||||||
uses: "dtolnay/rust-toolchain@stable",
|
uses: "dsherret/rust-toolchain-file@v1",
|
||||||
};
|
};
|
||||||
const installPythonSteps = [{
|
const installPythonSteps = [{
|
||||||
name: "Install Python",
|
name: "Install Python",
|
||||||
|
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -101,7 +101,7 @@ jobs:
|
||||||
mkdir -p target/release
|
mkdir -p target/release
|
||||||
tar --exclude=".git*" --exclude=target --exclude=third_party/prebuilt \
|
tar --exclude=".git*" --exclude=target --exclude=third_party/prebuilt \
|
||||||
-czvf target/release/deno_src.tar.gz -C .. deno
|
-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'')'
|
||||||
- if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (steps.exit_early.outputs.EXIT_EARLY != ''true'' && (matrix.job == ''lint'' || matrix.job == ''test''))'
|
- 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
|
name: Install Deno
|
||||||
|
|
Loading…
Add table
Reference in a new issue