Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: change rust-toolchain format to toml #5070

Merged
merged 1 commit into from
Jan 30, 2025

Conversation

CarolYeh910
Copy link
Contributor

@CarolYeh910 CarolYeh910 commented Jan 28, 2025

Resolved issues:

part of #4986

Description of changes:

When testing #5065, I discovered the cargo run for restricted-MSRV failed due to this dependency parse error, saying the non-TOML rust-toolchain format was deprecated by Rust. This format is also being used in two other CI jobs: clippy and msrv. This PR is meant to replace the plain rust-toolchain files with TOML.

Commit breakdown:

  1. Updated the rust version in Check MSRV commands with the value parsed from rust-toolchain.toml
  2. Replaced rust-toolchain files with rust-toolchain.toml in extended, standard, and standard/bench folders

Call-outs:

None

Testing:

The two affected CI jobs (clippy and msrv) succeeded with this PR.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions github-actions bot added the s2n-core team label Jan 28, 2025
@CarolYeh910 CarolYeh910 added s2n-core team and removed s2n-core team labels Jan 28, 2025
@CarolYeh910 CarolYeh910 enabled auto-merge January 29, 2025 00:20
@@ -327,15 +333,22 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true

- uses: SebRollen/[email protected]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- uses: SebRollen/toml-action@v1.2.0
- uses: SebRollen/toml-action@v1

Nit: Let's just specify the major version. Otherwise dependabot will open a PR for every patch update.

@CarolYeh910 CarolYeh910 added this pull request to the merge queue Jan 30, 2025
Merged via the queue into aws:main with commit 76561dc Jan 30, 2025
45 checks passed
@CarolYeh910 CarolYeh910 deleted the update-rust-toolchain branch January 30, 2025 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants