Skip to content

Commit f6531c9

Browse files
the-mikedavisarchseer
authored andcommitted
inherit rust toolchain channel from rust-toolchain.toml
We've forked actions-rs/toolchain and merged actions-rs/toolchain#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.
1 parent 35303f7 commit f6531c9

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ jobs:
1616
uses: actions/checkout@v3
1717

1818
- name: Install stable toolchain
19-
uses: actions-rs/toolchain@v1
19+
uses: helix-editor/rust-toolchain@v1
2020
with:
2121
profile: minimal
22-
toolchain: stable
2322
override: true
2423

2524
- uses: Swatinem/rust-cache@v1
@@ -37,10 +36,9 @@ jobs:
3736
uses: actions/checkout@v3
3837

3938
- name: Install stable toolchain
40-
uses: actions-rs/toolchain@v1
39+
uses: helix-editor/rust-toolchain@v1
4140
with:
4241
profile: minimal
43-
toolchain: ${{ matrix.rust }}
4442
override: true
4543

4644
- uses: Swatinem/rust-cache@v1
@@ -64,7 +62,6 @@ jobs:
6462
strategy:
6563
matrix:
6664
os: [ubuntu-latest, macos-latest, windows-latest]
67-
rust: [stable]
6865

6966
lints:
7067
name: Lints
@@ -74,10 +71,9 @@ jobs:
7471
uses: actions/checkout@v3
7572

7673
- name: Install stable toolchain
77-
uses: actions-rs/toolchain@v1
74+
uses: helix-editor/rust-toolchain@v1
7875
with:
7976
profile: minimal
80-
toolchain: stable
8177
override: true
8278
components: rustfmt, clippy
8379

@@ -103,10 +99,9 @@ jobs:
10399
uses: actions/checkout@v3
104100

105101
- name: Install stable toolchain
106-
uses: actions-rs/toolchain@v1
102+
uses: helix-editor/rust-toolchain@v1
107103
with:
108104
profile: minimal
109-
toolchain: stable
110105
override: true
111106

112107
- uses: Swatinem/rust-cache@v1

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
uses: actions-rs/toolchain@v1
1818
with:
1919
profile: minimal
20-
toolchain: stable
2120
override: true
2221

2322
- uses: Swatinem/rust-cache@v1

0 commit comments

Comments
 (0)