Skip to content

Commit d8b07cf

Browse files
authored
Merge branch 'master' into update-rust-test-conform-new-spec
2 parents 8074f32 + babf7e3 commit d8b07cf

File tree

3 files changed

+15
-37
lines changed

3 files changed

+15
-37
lines changed

.github/workflows/cache-factory.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ jobs:
3838

3939
- uses: actions/checkout@v3
4040

41-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
41+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
4242
with:
43-
toolchain: ${{ matrix.rust }}
44-
override: true
43+
toolchain: ${{ matrix.rust }}
4544

4645
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
4746
with:
@@ -61,10 +60,9 @@ jobs:
6160

6261
- uses: actions/checkout@v3
6362

64-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
63+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
6564
with:
66-
toolchain: stable
67-
override: true
65+
toolchain: stable
6866

6967
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
7068
with:

.github/workflows/ci.yml

+10-28
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ jobs:
3535
echo "version=${RUST_VERSION}" >> $GITHUB_OUTPUT
3636
3737
- name: Install Rust ${{ steps.parse-msrv.outputs.version }} for MSRV check
38-
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
38+
uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
3939
with:
40-
profile: minimal
4140
toolchain: ${{ steps.parse-msrv.outputs.version }}
42-
override: true
4341

4442
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
4543
with:
@@ -49,11 +47,9 @@ jobs:
4947
- name: Check if ${{ matrix.crate }} compiles on MSRV (Rust ${{ steps.parse-msrv.outputs.version }})
5048
run: cargo +${{ steps.parse-msrv.outputs.version }} build --package ${{ matrix.crate }} --all-features
5149

52-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
50+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
5351
with:
54-
profile: minimal
5552
toolchain: stable
56-
override: true
5753

5854
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
5955
with:
@@ -113,11 +109,9 @@ jobs:
113109

114110
- uses: actions/checkout@v3
115111

116-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
112+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
117113
with:
118-
profile: minimal
119114
toolchain: stable
120-
override: true
121115
target: ${{ matrix.target }}
122116

123117
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
@@ -141,11 +135,9 @@ jobs:
141135

142136
- uses: actions/checkout@v3
143137

144-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
138+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
145139
with:
146-
profile: minimal
147140
toolchain: stable
148-
override: true
149141

150142
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
151143
with:
@@ -163,11 +155,9 @@ jobs:
163155

164156
- uses: actions/checkout@v3
165157

166-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
158+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
167159
with:
168-
profile: minimal
169160
toolchain: stable
170-
override: true
171161

172162
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
173163
with:
@@ -191,11 +181,9 @@ jobs:
191181

192182
- uses: actions/checkout@v3
193183

194-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
184+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
195185
with:
196-
profile: minimal
197186
toolchain: ${{ matrix.rust-version }}
198-
override: true
199187
components: clippy
200188

201189
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
@@ -216,11 +204,9 @@ jobs:
216204

217205
- uses: actions/checkout@v3
218206

219-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
207+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
220208
with:
221-
profile: minimal
222209
toolchain: stable
223-
override: true
224210

225211
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
226212
with:
@@ -234,11 +220,9 @@ jobs:
234220
steps:
235221
- uses: actions/checkout@v3
236222

237-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
223+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
238224
with:
239-
profile: minimal
240225
toolchain: stable
241-
override: true
242226
components: rustfmt
243227

244228
- name: Check formatting
@@ -249,11 +233,9 @@ jobs:
249233
steps:
250234
- uses: actions/checkout@v3
251235

252-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
253-
with:
254-
profile: minimal
236+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
237+
with:
255238
toolchain: stable
256-
override: true
257239

258240
- name: Ensure `full` feature contains all features
259241
run: |

.github/workflows/publish-interop-test-images.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v3
2424

25-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
25+
- uses: dtolnay/rust-toolchain@ce8f65846d7180d2ce63b1e74483d981800b9e22 # v1
2626
with:
27-
profile: minimal
2827
toolchain: stable
29-
override: true
3028

3129
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
3230
with:

0 commit comments

Comments
 (0)