search

bazelbuild / continuous-integration

Bazel's Continuous Integration Setup
https://buildkite.com
Apache License 2.0
259 stars 135 forks source link

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

Closed iancha1992 closed 4 months ago

iancha1992 commented 4 months ago

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 commented 4 months ago

@keertk

meteorcloudy commented 4 months ago

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 commented 4 months ago

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 commented 4 months ago

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 commented 4 months ago

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 commented 4 months ago

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.