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

Do we have to merge OwlBot pull requests in order? #8546

Closed
suztomo opened this issue Oct 7, 2022 · 0 comments
Closed

Do we have to merge OwlBot pull requests in order? #8546

suztomo opened this issue Oct 7, 2022 · 0 comments
Labels
priority: p3 Desirable enhancement or fix. May not be included in next release. type: question Request for information or clarification. Not an issue.

Comments

@suztomo
Copy link
Member

suztomo commented Oct 7, 2022

Do we have to merge OwlBot pull requests in order to avoid old changes overriding new changes?

No, the order is not important as long as you "Regenerate" the pull request. The OwlBot service's regeneration uses the latest master branch of googleapis-gen repository.

For example, #8495 ("chore(bazel): [Many APIs] update protobuf to v3.21.7") came before #8534 ("feat: [cloudasset] add a new searchable field kmsKeys").

I merged #8534 first and then regenerated #8495. As the result, the pull request #8495 does not have any diff from main branch.

One of the changes in 8534 was "kmsKeys" field in AssetServiceClient.java. By checking out the branch of #8495, I confirmed that the changes in the pull request does not revert back the recent AssetServiceClient.java changes and there's no changes to merge in java-asset module (because the changes to the module were already merged to main branch by #8534 .

suztomo@suztomo:/tmp/google-cloud-java$ git diff origin/main -- java-asset
suztomo@suztomo:/tmp/google-cloud-java$ git log -1
commit 7ff297af3466723931c6ed5b071f7646738cd2cb (HEAD -> owl-bot-copy-b9f6ecf6eb4737307b25, origin/owl-bot-copy-b9f6ecf6eb4737307b25)
Author: Tomo Suzuki <[email protected]>
Date:   Thu Oct 6 23:04:13 2022 +0000

    owlbot manual invocation
@suztomo suztomo added type: question Request for information or clarification. Not an issue. priority: p3 Desirable enhancement or fix. May not be included in next release. labels Oct 7, 2022
@suztomo suztomo closed this as completed Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: p3 Desirable enhancement or fix. May not be included in next release. type: question Request for information or clarification. Not an issue.
Projects
None yet
Development

No branches or pull requests

1 participant