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

Subtree Update Automation Fixes #250

Merged
merged 11 commits into from
Mar 4, 2025

Conversation

thanhnguyen-aws
Copy link

@thanhnguyen-aws thanhnguyen-aws commented Feb 20, 2025

Improvements to the workflow to update the subtree:

  • Check for existing PRs before creating new ones
  • Update the Kani version automatically
  • Remove erroneous additional submodules
  • Typo in toolchain file

Resolves #249

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

@thanhnguyen-aws thanhnguyen-aws requested a review from a team as a code owner February 20, 2025 21:13
@carolynzech
Copy link

Thanks for the quick PR. Are you also planning to fix the first item in the issue? We shouldn't mark this PR as resolving the issue until it fixes both.
(If you'd prefer to split #249 into two sub-issues, that's fine too).

@carolynzech
Copy link

Could you also incorporate these changes https://github.com/carolynzech/rust/tree/fix-subtree-bugs in this PR? (It skips the PR creations if they already exist, avoiding situations where we force push over commits that people have made to those PR branches since).

@carolynzech
Copy link

It'd also be nice to automate updating the Kani version in tool_config/ by finding the last commit to update rust-toolchain.toml, but that's not as important to get to in this PR (just an improvement, not a bug).

@tautschnig
Copy link
Member

It'd also be nice to automate updating the Kani version in tool_config/ by finding the last commit to update rust-toolchain.toml, but that's not as important to get to in this PR (just an improvement, not a bug).

Oh, we could actually easily get the Kani commit id from the first step in the automation, which works in the Kani repository anyway.

Copy link

@carolynzech carolynzech left a comment

Choose a reason for hiding this comment

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

Can you update the PR description and title to document the changes you made?

@carolynzech carolynzech changed the title Fixing Update automation bug Subtree Update Automation Fixes Mar 3, 2025
Copy link

@carolynzech carolynzech left a comment

Choose a reason for hiding this comment

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

Can you please make these changes, then I'll approve? Perhaps @tautschnig or @qinheping could review as well.
I have not tested these suggested changes locally; please run it on your fork to make sure I'm right :)

@thanhnguyen-aws
Copy link
Author

I ran this fixed Subtree Update on my fork and see that:

  1. It updated Kani to the correct (most updated) version.
    (Merge subtree update for toolchain nightly-2025-02-21 thanhnguyen-aws/verify-rust-std#11)
  2. When there exists similar PR, it does not create more PRs (and indeed terminated after finding the PR).
    (https://github.com/thanhnguyen-aws/verify-rust-std/actions/runs/13639811389/job/38126890075)

@tautschnig tautschnig enabled auto-merge March 3, 2025 22:09
@tautschnig tautschnig added this pull request to the merge queue Mar 4, 2025
Merged via the queue into model-checking:main with commit 0027317 Mar 4, 2025
15 of 17 checks passed
tautschnig added a commit to tautschnig/verify-rust-std that referenced this pull request Mar 18, 2025
This restores a fix from model-checking#250 that was deemed no longer necessary with
the move to subtree split (in model-checking#270), but this proved to be wrong. (See
model-checking@ab648fe
for such an example of an unintended change.)
github-merge-queue bot pushed a commit that referenced this pull request Mar 19, 2025
This restores a fix from #250 that was deemed no longer necessary with
the move to subtree split (in #270), but this proved to be wrong. (See
ab648fe
for such an example of an unintended change.)

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

Co-authored-by: thanhnguyen-aws <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Subtree Update Automation Workflow Bugs
3 participants