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

Update lockfiles when PR is merged to a release branch #1950

Merged
merged 2 commits into from
May 22, 2024

Conversation

iancha1992
Copy link
Member

@iancha1992 iancha1992 commented May 13, 2024

This will resolve the lockfile conflicts in the release- branch PR's if the changes were to happen in a release branch.
This is first triggered by any changes pushed to a release branch. And then once it finds out that there is conflicts with the lockfiles, then it will update the lockfiles and force push the changes. Only applies to the PR's from the bazel-io account.

@iancha1992
Copy link
Member Author

@keertk

@iancha1992 iancha1992 marked this pull request as ready for review May 14, 2024 22:38
@meteorcloudy
Copy link
Member

Can you elaborate more in the PR description about what it does? Is it because the lockfile may not be in a correct state after merging some PRs?

@iancha1992
Copy link
Member Author

iancha1992 commented May 21, 2024

Can you elaborate more in the PR description about what it does? Is it because the lockfile may not be in a correct state after merging some PRs?

@meteorcloudy Sure! I just added more details. This will basically resolve the lockfile conflicts in the release- branch PR's if a PR's changes were to merge in a release branch.

@meteorcloudy
Copy link
Member

And then once it finds out that there is conflicts with the lockfiles, then it will update the lockfiles and force push the changes

Oh, so this should happen before the PR is merged to the release branch, right?

@meteorcloudy
Copy link
Member

This is first triggered by any changes pushed to a release branch.

Theoretically, if a change is pushed to a release branch, it should have already passed the presubmit, which means the lockfiles are up-to-date?

@iancha1992
Copy link
Member Author

This is first triggered by any changes pushed to a release branch.

Theoretically, if a change is pushed to a release branch, it should have already passed the presubmit, which means the lockfiles are up-to-date?

@meteorcloudy Yes, correct. But I'm referring to the other PR's (to the same branch) with lockfiles in it. Those will get conflicts with the lockfiles since there is a change to the lockfiles in the branch.

Copy link
Member

@meteorcloudy meteorcloudy left a comment

Choose a reason for hiding this comment

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

Thank you!!

@meteorcloudy meteorcloudy merged commit 968f5d3 into bazelbuild:master May 22, 2024
1 check passed
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.

None yet

2 participants