diff options
| author | Michael Davis | 2022-05-22 01:46:20 +0000 |
|---|---|---|
| committer | Blaž Hrastnik | 2022-05-23 16:05:19 +0000 |
| commit | f6531c9db013b59dced06e24e132fcb6f4b65152 (patch) | |
| tree | db255667d105f0f5cf999237246fc246ba04f905 | |
| parent | 35303f749e3e918b76bcf3f01223da6e27c77f34 (diff) | |
inherit rust toolchain channel from rust-toolchain.toml
We've forked actions-rs/toolchain and merged
https://github.com/actions-rs/toolchain/pull/209
so we can take advantage of full support of `rust-toolchain.toml`.
Without that PR, the action fails because the `rustup` version
built into the runners by default is too old. #2528 covers switching
back to the upstream when it includes those changes.
| -rw-r--r-- | .github/workflows/build.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 1 |
2 files changed, 4 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4594cfa..f3cd128a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,10 +16,9 @@ jobs: uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + uses: helix-editor/rust-toolchain@v1 with: profile: minimal - toolchain: stable override: true - uses: Swatinem/rust-cache@v1 @@ -37,10 +36,9 @@ jobs: uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + uses: helix-editor/rust-toolchain@v1 with: profile: minimal - toolchain: ${{ matrix.rust }} override: true - uses: Swatinem/rust-cache@v1 @@ -64,7 +62,6 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [stable] lints: name: Lints @@ -74,10 +71,9 @@ jobs: uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + uses: helix-editor/rust-toolchain@v1 with: profile: minimal - toolchain: stable override: true components: rustfmt, clippy @@ -103,10 +99,9 @@ jobs: uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + uses: helix-editor/rust-toolchain@v1 with: profile: minimal - toolchain: stable override: true - uses: Swatinem/rust-cache@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6bb52ce..bfafd7ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,6 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable override: true - uses: Swatinem/rust-cache@v1 |