-
Notifications
You must be signed in to change notification settings - Fork 724
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: change rust-toolchain format to toml (#5070)
- Loading branch information
1 parent
f146f06
commit 76561dc
Showing
7 changed files
with
23 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -306,9 +306,15 @@ jobs: | |
- uses: camshaft/rust-cache@v1 | ||
|
||
- uses: SebRollen/[email protected] | ||
id: read_toml | ||
with: | ||
file: '${{env.ROOT_PATH}}/rust-toolchain.toml' | ||
field: 'toolchain.channel' | ||
|
||
# Enforce that clippy's msrv matches rust-toolchain | ||
- name: Check MSRV | ||
run: grep $(cat ${{env.ROOT_PATH}}/rust-toolchain) ${{env.ROOT_PATH}}/.clippy.toml | ||
run: grep "${{steps.read_toml.outputs.value}}" ${{env.ROOT_PATH}}/.clippy.toml | ||
|
||
# We don't need to format the generated files, | ||
# but if they don't exist other code breaks. | ||
|
@@ -327,15 +333,22 @@ jobs: | |
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
|
||
- uses: SebRollen/[email protected] | ||
id: read_toml | ||
with: | ||
file: '${{env.ROOT_PATH}}/rust-toolchain.toml' | ||
field: 'toolchain.channel' | ||
|
||
# Enforce crate msrv matches rust-toolchain | ||
- name: Check MSRV of s2n-tls | ||
run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls/Cargo.toml | ||
run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls/Cargo.toml | ||
|
||
- name: Check MSRV of s2n-tls-sys | ||
run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls-sys/templates/Cargo.template | ||
run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls-sys/templates/Cargo.template | ||
|
||
- name: Check MSRV of s2n-tokio | ||
run: grep "rust-version = \"$(cat ${{env.ROOT_PATH}}/rust-toolchain)\"" ${{env.ROOT_PATH}}/s2n-tls-tokio/Cargo.toml | ||
run: grep "rust-version = \"${{steps.read_toml.outputs.value}}\"" ${{env.ROOT_PATH}}/s2n-tls-tokio/Cargo.toml | ||
|
||
pcaps: | ||
runs-on: ubuntu-24.04 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
[toolchain] | ||
channel = "1.63.0" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
[toolchain] | ||
channel = "stable" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
[toolchain] | ||
channel = "1.74.0" |