Skip to content

Commit 4389315

Browse files
committed
More consistent rust-toolchain setup.
1 parent ae38506 commit 4389315

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

.github/workflows/macos.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ jobs:
1111
with:
1212
submodules: true
1313

14-
- name: Setup
15-
run: |
16-
rustup toolchain install nightly-2024-05-18-aarch64-apple-darwin
17-
rustup component add rust-src --toolchain nightly-2024-05-18-aarch64-apple-darwin
14+
- name: Install Rust Nightly
15+
uses: dtolnay/rust-toolchain@stable
16+
with:
17+
toolchain: nightly-2024-05-18
18+
components: rust-src
1819

1920
- name: Build binary
2021
run: ./tool/build_macos.sh aarch64
@@ -35,10 +36,11 @@ jobs:
3536
with:
3637
submodules: true
3738

38-
- name: Setup
39-
run: |
40-
rustup toolchain install nightly-2024-05-18-x86_64-apple-darwin
41-
rustup component add rust-src --toolchain nightly-2024-05-18-x86_64-apple-darwin
39+
- name: Install Rust Nightly
40+
uses: dtolnay/rust-toolchain@stable
41+
with:
42+
toolchain: nightly-2024-05-18
43+
components: rust-src
4244

4345
- name: Build binary
4446
run: ./tool/build_macos.sh x64

.github/workflows/tests.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ jobs:
2020
- name: Ubuntu setup
2121
if: matrix.os == 'ubuntu-24.04'
2222
run: |
23-
sudo apt install libreadline-dev gcc-aarch64-linux-gnu
23+
sudo apt install libreadline-dev
24+
25+
- name: Install Rust Nightly
26+
uses: dtolnay/rust-toolchain@stable
27+
with:
28+
toolchain: nightly-2024-05-18
29+
components: rust-src
2430

2531
- name: Build
2632
run: |

.github/workflows/windows.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ jobs:
1010
with:
1111
submodules: true
1212

13-
- name: Setup
14-
run: |
15-
rustup toolchain install nightly-2024-05-18-x86_64-pc-windows-msvc
16-
rustup component add rust-src --toolchain nightly-2024-05-18-x86_64-pc-windows-msvc
13+
- name: Install Rust Nightly
14+
uses: dtolnay/rust-toolchain@stable
15+
with:
16+
toolchain: nightly-2024-05-18
17+
components: rust-src
1718

1819
- name: Build binary
1920
run: ./tool/build_windows.sh x64

0 commit comments

Comments
 (0)