TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

inherit rust toolchain channel from rust-toolchain.toml

Browse source 
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.
This commit is contained in:
Michael Davis 2022-05-21 20:46:20 -05:00 • committed by Blaž Hrastnik
parent 35303f749e
commit f6531c9db0
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/build.yml vendored
View file

@ -16,10 +16,9 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: actions-rs/toolchain@v1 uses: helix-editor/rust-toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: stable
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
@ -37,10 +36,9 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: actions-rs/toolchain@v1 uses: helix-editor/rust-toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: ${{ matrix.rust }}
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
@ -64,7 +62,6 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
rust: [stable]
lints: lints:
name: Lints name: Lints
@ -74,10 +71,9 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: actions-rs/toolchain@v1 uses: helix-editor/rust-toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: stable
override: true override: true
components: rustfmt, clippy components: rustfmt, clippy
@ -103,10 +99,9 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: actions-rs/toolchain@v1 uses: helix-editor/rust-toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: stable
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1

1
.github/workflows/release.yml vendored
View file

@ -17,7 +17,6 @@ jobs:
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: stable
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1