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: fix dependabot, commit & check Cargo.toml #5065

Merged
merged 9 commits into from
Feb 5, 2025

Conversation

CarolYeh910
Copy link
Contributor

@CarolYeh910 CarolYeh910 commented Jan 27, 2025

Resolved issues:

resolves #4986

Description of changes:

Based on my experiment, simply excluding s2n-tls-sys from dependabot.yml cannot prevent dependabot retrieving the Cargo file. Hence we decided to commit s2n-tls-sys/Cargo.toml and add a new job in ci_rust.yml to check if the file is up-to-date. Furthermore, testing showed that generated feature list may have a different order from the committed Cargo.toml, thus I added a sort() to the source code generate/src/main.rs.

Below is a list of changed files:

  1. Updated crate paths in dependabot.yml
  2. Created a GitHub action in ci_rust.yml to check if s2n-tls-sys/Cargo.toml is up-to-date in future PRs
  3. Updated extended/.gitignore and committed s2n-tls-sys/Cargo.toml
  4. Added sorting to the unstable feature list generated by generate/src/main.rs

Call-outs:

None

Testing:

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

@CarolYeh910 CarolYeh910 requested a review from goatgoose January 27, 2025 23:22
@github-actions github-actions bot added the s2n-core team label Jan 27, 2025
.github/workflows/check_cargo.yml Outdated Show resolved Hide resolved
.github/workflows/check_cargo.yml Outdated Show resolved Hide resolved
.github/workflows/check_cargo.yml Outdated Show resolved Hide resolved
.github/workflows/check_cargo.yml Outdated Show resolved Hide resolved
@CarolYeh910 CarolYeh910 marked this pull request as draft January 28, 2025 19:42
@CarolYeh910 CarolYeh910 marked this pull request as ready for review January 29, 2025 00:31
.github/workflows/ci_rust.yml Outdated Show resolved Hide resolved
.github/workflows/ci_rust.yml Show resolved Hide resolved
Co-authored-by: Sam Clark <[email protected]>
@CarolYeh910 CarolYeh910 requested a review from goatgoose January 30, 2025 19:44
@CarolYeh910 CarolYeh910 added this pull request to the merge queue Feb 5, 2025
Merged via the queue into aws:main with commit 3fd1006 Feb 5, 2025
45 checks passed
@CarolYeh910 CarolYeh910 deleted the fix-dependabot branch February 5, 2025 20:16
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.

Exclude s2n-tls-sys from dependabot
3 participants