Skip to content

Commit 388e004

Browse files
CarolYeh910johubertj
authored andcommitted
ci: change rust-toolchain format to toml (aws#5070)
1 parent f1e23db commit 388e004

File tree

7 files changed

+23
-7
lines changed

7 files changed

+23
-7
lines changed

.github/workflows/ci_rust.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,15 @@ jobs:
306306
307307
- uses: camshaft/rust-cache@v1
308308

309+
- uses: SebRollen/[email protected]
310+
id: read_toml
311+
with:
312+
file: '${{env.ROOT_PATH}}/rust-toolchain.toml'
313+
field: 'toolchain.channel'
314+
309315
# Enforce that clippy's msrv matches rust-toolchain
310316
- name: Check MSRV
311-
run: grep $(cat ${{env.ROOT_PATH}}/rust-toolchain) ${{env.ROOT_PATH}}/.clippy.toml
317+
run: grep "${{steps.read_toml.outputs.value}}" ${{env.ROOT_PATH}}/.clippy.toml
312318

313319
# We don't need to format the generated files,
314320
# but if they don't exist other code breaks.
@@ -327,15 +333,22 @@ jobs:
327333
- uses: actions/checkout@v4
328334
with:
329335
submodules: true
336+
337+
- uses: SebRollen/[email protected]
338+
id: read_toml
339+
with:
340+
file: '${{env.ROOT_PATH}}/rust-toolchain.toml'
341+
field: 'toolchain.channel'
342+
330343
# Enforce crate msrv matches rust-toolchain
331344
- name: Check MSRV of s2n-tls
332-
run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls/Cargo.toml
345+
run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls/Cargo.toml
333346

334347
- name: Check MSRV of s2n-tls-sys
335-
run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls-sys/templates/Cargo.template
348+
run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls-sys/templates/Cargo.template
336349

337350
- name: Check MSRV of s2n-tokio
338-
run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls-tokio/Cargo.toml
351+
run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls-tokio/Cargo.toml
339352

340353
pcaps:
341354
runs-on: ubuntu-24.04

bindings/rust/extended/rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.63.0"

bindings/rust/standard/bench/rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "stable"

bindings/rust/standard/rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.74.0"

0 commit comments

Comments
 (0)