Skip to content

Subtree update automation: create merge PR even when subtree/library is up-to-date #326

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

Merged
merged 1 commit into from
Apr 17, 2025

Conversation

tautschnig
Copy link
Member

When the PR updating the subtree/library branch has been merged already we may still need to bring updates into main that haven't previously been added to a pull request. This situation arises when an older merge-into-main PR was still open at the time where the subtree automation creating the subtree/library update PR ran.

The changes in this PR avoid this problem by making sure the merge-into-main part of the automation is run even when subtree/library is already up-to-date.

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

@tautschnig tautschnig requested a review from a team as a code owner April 15, 2025 12:22
@tautschnig tautschnig self-assigned this Apr 15, 2025
@tautschnig tautschnig marked this pull request as draft April 15, 2025 13:05
…is up-to-date

When the PR updating the `subtree/library` branch has been merged
already we may still need to bring updates into `main` that haven't
previously been added to a pull request. This situation arises when an
older merge-into-main PR was still open at the time where the subtree
automation creating the `subtree/library` update PR ran.

The changes in this PR avoid this problem by making sure the
merge-into-main part of the automation is run even when
`subtree/library` is already up-to-date.
@tautschnig tautschnig force-pushed the disentable-update-logic branch from ce3aa02 to af95c41 Compare April 15, 2025 20:36
@tautschnig tautschnig marked this pull request as ready for review April 15, 2025 20:37
@tautschnig
Copy link
Member Author

See https://github.com/tautschnig/verify-rust-std/actions/runs/14478714643/job/40610591806 for a log of a (successful) run with these changes.

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.

Thanks!

@carolynzech carolynzech removed their assignment Apr 15, 2025
@carolynzech carolynzech added this pull request to the merge queue Apr 17, 2025
Merged via the queue into model-checking:main with commit e33c59d Apr 17, 2025
18 of 19 checks passed
@tautschnig tautschnig deleted the disentable-update-logic branch April 18, 2025 08:43
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.

4 participants