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

libraries-bom version updates cause Git conflict #10182

Closed
suztomo opened this issue Jan 2, 2024 · 3 comments
Closed

libraries-bom version updates cause Git conflict #10182

suztomo opened this issue Jan 2, 2024 · 3 comments
Labels
priority: p2 Moderately-important priority. Fix may not be included in next release. type: bug Error or flaw in code with unintended results or allowing sub-optimal usage patterns.

Comments

@suztomo
Copy link
Member

suztomo commented Jan 2, 2024

We started using RenovateBot to update the Libraries BOM version. The last one was de8046b 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 #10133. This pull request was created on Dec 8th, earlier than the last Libraries BOM version update on Dec. 14th.

Other cases:

(and more)

@suztomo
Copy link
Member Author

suztomo commented Jan 2, 2024

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

@JoeWang1127 JoeWang1127 added type: bug Error or flaw in code with unintended results or allowing sub-optimal usage patterns. priority: p2 Moderately-important priority. Fix may not be included in next release. labels Jan 4, 2024
@meltsufin
Copy link
Member

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.

@suztomo
Copy link
Member Author

suztomo commented Mar 19, 2024

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

@suztomo suztomo closed this as completed Mar 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: p2 Moderately-important priority. Fix may not be included in next release. type: bug Error or flaw in code with unintended results or allowing sub-optimal usage patterns.
Projects
None yet
Development

No branches or pull requests

3 participants