google-cloud-java icon indicating copy to clipboard operation
google-cloud-java copied to clipboard

libraries-bom version updates cause Git conflict

Open suztomo opened this issue 1 year ago • 1 comments

We started using RenovateBot to update the Libraries BOM version. The last one was https://github.com/googleapis/google-cloud-java/commit/de8046bfe66a99c7ef3c5205359ae5f11f74a865 on Dec. 14th.

The the Libraries BOM version line is also maintained by the OwlBot postprocessor. When the timing is not perfect, we have Git conflicts on these lines. For example:

Screenshot 2024-01-02 at 11 21 20 AM

in https://github.com/googleapis/google-cloud-java/pull/10133. This pull request was created on Dec 8th, earlier than the last Libraries BOM version update on Dec. 14th.

Other cases:

  • https://github.com/googleapis/google-cloud-java/pull/10121 was conflicting
  • https://github.com/googleapis/google-cloud-java/pull/10123 was conflicting
  • https://github.com/googleapis/google-cloud-java/pull/10124 was conflicting
  • https://github.com/googleapis/google-cloud-java/pull/10133 was conflicting

(and more)

suztomo avatar Jan 02 '24 16:01 suztomo

Checking to see whether adding "owlbot:run" resolves the problem in https://github.com/googleapis/google-cloud-java/pull/10137.

suztomo avatar Jan 02 '24 16:01 suztomo

Checking to see whether adding "owlbot:run" resolves the problem in #10137.

@suztomo Did it? Can we close this? We're also moving away from owlbot which should make this obsolete soon.

meltsufin avatar Mar 19 '24 01:03 meltsufin

Yes, it worked. This was due to the timing of the libraries BOM release, RenovateBot, and OwlBot postprocessor. Closing.

suztomo avatar Mar 19 '24 13:03 suztomo