Skip to content

Commit 4680097

Browse files
authored
Merge pull request #715 from rust-lang/ci-rust-install
Use GitHub Actions to install Rust and cargo-hack
2 parents 0bb071f + eaf9e79 commit 4680097

File tree

1 file changed

+15
-32
lines changed

1 file changed

+15
-32
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ jobs:
3535
rust: stable-x86_64-pc-windows-gnu
3636
steps:
3737
- uses: actions/checkout@v4
38-
- name: Install toolchain
39-
run: |
40-
rustup update ${{ matrix.rust }} --no-self-update
41-
rustup default ${{ matrix.rust }}
42-
cargo +stable install cargo-hack --locked
38+
- uses: dtolnay/rust-toolchain@master
39+
with:
40+
toolchain: ${{ matrix.rust }}
41+
- uses: taiki-e/install-action@cargo-hack
4342
- run: cargo hack test --feature-powerset --exclude-features max_level_off,max_level_error,max_level_warn,max_level_info,max_level_debug,max_level_trace,release_max_level_off,release_max_level_error,release_max_level_warn,release_max_level_info,release_max_level_debug,release_max_level_trace
4443
- run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml
4544
- run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml --release
@@ -49,11 +48,9 @@ jobs:
4948
runs-on: ubuntu-latest
5049
steps:
5150
- uses: actions/checkout@v4
52-
- name: Install toolchain
53-
run: |
54-
rustup update stable --no-self-update
55-
rustup default stable
56-
rustup component add clippy rustfmt
51+
- uses: dtolnay/rust-toolchain@stable
52+
with:
53+
components: clippy
5754
- run: cargo fmt -- --check
5855
- run: cargo fmt --manifest-path test_max_level_features/Cargo.toml -- --check
5956
- run: cargo clippy --verbose
@@ -64,11 +61,7 @@ jobs:
6461
runs-on: ubuntu-latest
6562
steps:
6663
- uses: actions/checkout@v4
67-
- name: Install toolchain
68-
run: |
69-
rustup update stable --no-self-update
70-
rustup default stable
71-
rustup component add rust-docs
64+
- uses: dtolnay/rust-toolchain@stable
7265
- name: Run rustdoc
7366
env:
7467
RUSTDOCFLAGS: "-D warnings"
@@ -79,10 +72,7 @@ jobs:
7972
runs-on: ubuntu-latest
8073
steps:
8174
- uses: actions/checkout@v4
82-
- name: Install toolchain
83-
run: |
84-
rustup update nightly --no-self-update
85-
rustup default nightly
75+
- uses: dtolnay/rust-toolchain@nightly
8676
- run: cargo build --verbose -Z avoid-dev-deps --features kv
8777
- run: cargo build --verbose -Z avoid-dev-deps --features "kv std"
8878
- run: cargo build --verbose -Z avoid-dev-deps --features "kv kv_sval"
@@ -95,10 +85,7 @@ jobs:
9585
runs-on: ubuntu-latest
9686
steps:
9787
- uses: actions/checkout@v4
98-
- name: Install toolchain
99-
run: |
100-
rustup update nightly --no-self-update
101-
rustup default nightly
88+
- uses: dtolnay/rust-toolchain@nightly
10289
- run: cargo build --verbose -Z minimal-versions --features kv
10390
- run: cargo build --verbose -Z minimal-versions --features "kv std"
10491
- run: cargo build --verbose -Z minimal-versions --features "kv kv_sval"
@@ -111,11 +98,10 @@ jobs:
11198
runs-on: ubuntu-latest
11299
steps:
113100
- uses: actions/checkout@v4
114-
- name: Install toolchain
115-
run: |
116-
rustup update 1.61.0 --no-self-update
117-
rustup default 1.61.0
118-
cargo +stable install cargo-hack --locked
101+
- uses: dtolnay/rust-toolchain@1.61.0
102+
with:
103+
components: clippy
104+
- uses: taiki-e/install-action@cargo-hack
119105
- run: cargo hack test --feature-powerset --exclude-features max_level_off,max_level_error,max_level_warn,max_level_info,max_level_debug,max_level_trace,release_max_level_off,release_max_level_error,release_max_level_warn,release_max_level_info,release_max_level_debug,release_max_level_trace
120106
- run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml
121107
- run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml --release
@@ -125,10 +111,7 @@ jobs:
125111
runs-on: ubuntu-latest
126112
steps:
127113
- uses: actions/checkout@v4
128-
- name: Install toolchain
129-
run: |
130-
rustup update stable --no-self-update
131-
rustup default stable
114+
- uses: dtolnay/rust-toolchain@stable
132115
- run: rustup target add thumbv6m-none-eabi riscv32imc-unknown-none-elf
133116
- run: cargo build --verbose --target=thumbv6m-none-eabi
134117
- run: cargo build --verbose --target=riscv32imc-unknown-none-elf

0 commit comments

Comments
 (0)