Skip to content

Commit 35f3599

Browse files
authored
Merge pull request #1621 from volta-cli/push-morroowvyplk
Switch to actions-rust-lang/setup-rust-toolchain
2 parents cb659e6 + 93afcb4 commit 35f3599

File tree

4 files changed

+8
-23
lines changed

4 files changed

+8
-23
lines changed

.github/workflows/api-docs.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ jobs:
1515
with:
1616
persist-credentials: false
1717
- name: Set up cargo
18-
uses: dtolnay/rust-toolchain@master
19-
with:
20-
toolchain: 1.75
18+
uses: actions-rust-lang/setup-rust-toolchain@v1
2119
- name: Cargo Cache
2220
uses: Swatinem/rust-cache@v2
2321
- name: Build docs

.github/workflows/release.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ jobs:
4141
- name: Check out code
4242
uses: actions/checkout@v3
4343
- name: Set up cargo
44-
uses: dtolnay/rust-toolchain@master
45-
with:
46-
toolchain: 1.75
44+
uses: actions-rust-lang/setup-rust-toolchain@v1
4745
- name: Cargo Cache
4846
uses: Swatinem/rust-cache@v2
4947
- name: Compile and package Volta
@@ -61,9 +59,8 @@ jobs:
6159
- name: Check out code
6260
uses: actions/checkout@v3
6361
- name: Set up cargo
64-
uses: dtolnay/rust-toolchain@master
62+
uses: actions-rust-lang/setup-rust-toolchain@v1
6563
with:
66-
toolchain: 1.75
6764
target: aarch64-apple-darwin
6865
- name: Cargo Cache
6966
uses: Swatinem/rust-cache@v2
@@ -82,9 +79,7 @@ jobs:
8279
- name: Check out code
8380
uses: actions/checkout@v3
8481
- name: Set up cargo
85-
uses: dtolnay/rust-toolchain@master
86-
with:
87-
toolchain: 1.75
82+
uses: actions-rust-lang/setup-rust-toolchain@v1
8883
- name: Cargo Cache
8984
uses: Swatinem/rust-cache@v2
9085
- name: Add cargo-wix subcommand

.github/workflows/test.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ jobs:
2424
- name: Check out code
2525
uses: actions/checkout@v3
2626
- name: Set up cargo
27-
uses: dtolnay/rust-toolchain@master
28-
with:
29-
toolchain: 1.75
30-
components: clippy
27+
uses: actions-rust-lang/setup-rust-toolchain@v1
3128
- name: Cargo Cache
3229
uses: Swatinem/rust-cache@v2
3330
- name: Run tests
@@ -48,9 +45,7 @@ jobs:
4845
- name: Check out code
4946
uses: actions/checkout@v3
5047
- name: Set up cargo
51-
uses: dtolnay/rust-toolchain@master
52-
with:
53-
toolchain: 1.75
48+
uses: actions-rust-lang/setup-rust-toolchain@v1
5449
- name: Cargo Cache
5550
uses: Swatinem/rust-cache@v2
5651
- name: Run tests
@@ -75,10 +70,7 @@ jobs:
7570
- name: Check out code
7671
uses: actions/checkout@v3
7772
- name: Set up cargo
78-
uses: dtolnay/rust-toolchain@master
79-
with:
80-
toolchain: 1.75
81-
components: rustfmt
73+
uses: actions-rust-lang/setup-rust-toolchain@v1
8274
- name: Cargo Cache
8375
uses: Swatinem/rust-cache@v2
8476
- name: Run check

tests/acceptance/volta_bypass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn shim_skips_platform_checks_on_bypass() {
2525

2626
#[cfg(windows)]
2727
assert_that!(
28-
s.process(&shim_exe()),
28+
s.process(shim_exe()),
2929
execs()
3030
.with_status(ExitCode::UnknownError as i32)
3131
.with_stderr_contains("[..]is not recognized as an internal or external command[..]")

0 commit comments

Comments
 (0)