Skip to content

fix: [cloudbuild] remove empty v2.CloudBuild definition#9077

Merged
emmileaf merged 6 commits intomainfrom
owl-bot-copy-java-cloudbuild
Feb 16, 2023
Merged

fix: [cloudbuild] remove empty v2.CloudBuild definition#9077
emmileaf merged 6 commits intomainfrom
owl-bot-copy-java-cloudbuild

Conversation

@gcf-owl-bot
Copy link
Contributor

@gcf-owl-bot gcf-owl-bot bot commented Feb 3, 2023 •
edited
Loading

  • Regenerate this pull request now.

PiperOrigin-RevId: 509865389

Source-Link: googleapis/googleapis@573e7eb

Source-Link: https://github.com/googleapis/googleapis-gen/commit/4c03ea45a7a2c247d9f5dd3b7fadbeece4b88e7d
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiI0YzAzZWE0NWE3YTJjMjQ3ZDlmNWRkM2I3ZmFkYmVlY2U0Yjg4ZTdkIn0=

BEGIN_NESTED_COMMIT
chore: [cloudbuild] configure CloudBuild V1 for PHP
PiperOrigin-RevId: 508723510

Source-Link: googleapis/googleapis@a3748ac

Source-Link: https://github.com/googleapis/googleapis-gen/commit/d0365debed4331c15ddfa6ef2904d7da0cdee732
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJkMDM2NWRlYmVkNDMzMWMxNWRkZmE2ZWYyOTA0ZDdkYTBjZGVlNzMyIn0=

feat: Client libraries for Cloud Build Repositories (preview)

PiperOrigin-RevId: 506886904

Source-Link: googleapis/googleapis@88181f5

Source-Link: https://github.com/googleapis/googleapis-gen/commit/a534d6f4a4347faaee521e130e9608e9988f2047
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJhNTM0ZDZmNGE0MzQ3ZmFhZWU1MjFlMTMwZTk2MDhlOTk4OGYyMDQ3In0=
END_NESTED_COMMIT

@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 3, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 3, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 3, 2023
@snippet-bot
Copy link

snippet-bot bot commented Feb 3, 2023 •
edited
Loading

Here is the summary of changes.

You are about to add 69 region tags.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 3, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 3, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 3, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 3, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 3, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 3, 2023
@gcf-owl-bot gcf-owl-bot bot changed the title feat: [cloudbuild] Client libraries for Cloud Build Repositories (preview) chore: [cloudbuild] configure CloudBuild V1 for PHP Feb 10, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 10, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 10, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 10, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 10, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 10, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 10, 2023
@gcf-owl-bot
Copy link
Contributor Author

gcf-owl-bot bot commented Feb 15, 2023

Owl bot is regenerating pull request 9077...
Build name: ZWFiMjk3YTUtMjAxOC00NGMzLTk3MWYtZmZiNzdlNWE2YmQ0

@gcf-owl-bot
chore: configure CloudBuild V1 for PHP
232c490 
PiperOrigin-RevId: 508723510

Source-Link: googleapis/googleapis@a3748ac

Source-Link: https://github.com/googleapis/googleapis-gen/commit/d0365debed4331c15ddfa6ef2904d7da0cdee732
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJkMDM2NWRlYmVkNDMzMWMxNWRkZmE2ZWYyOTA0ZDdkYTBjZGVlNzMyIn0=

feat: Client libraries for Cloud Build Repositories (preview)

PiperOrigin-RevId: 506886904

Source-Link: googleapis/googleapis@88181f5

Source-Link: https://github.com/googleapis/googleapis-gen/commit/a534d6f4a4347faaee521e130e9608e9988f2047
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJhNTM0ZDZmNGE0MzQ3ZmFhZWU1MjFlMTMwZTk2MDhlOTk4OGYyMDQ3In0=
@gcf-owl-bot gcf-owl-bot bot force-pushed the owl-bot-copy-java-cloudbuild branch from 9c199ad to 232c490 Compare February 15, 2023 20:03
@trusted-contributions-gcf trusted-contributions-gcf bot added the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 15, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 15, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 15, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 15, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 15, 2023
@gcf-owl-bot
fix: remove empty v2.CloudBuild definition
f232591 
PiperOrigin-RevId: 509865389

Source-Link: googleapis/googleapis@573e7eb

Source-Link: https://github.com/googleapis/googleapis-gen/commit/4c03ea45a7a2c247d9f5dd3b7fadbeece4b88e7d
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiI0YzAzZWE0NWE3YTJjMjQ3ZDlmNWRkM2I3ZmFkYmVlY2U0Yjg4ZTdkIn0=
@gcf-owl-bot gcf-owl-bot bot changed the title chore: [cloudbuild] configure CloudBuild V1 for PHP fix: [cloudbuild] remove empty v2.CloudBuild definition Feb 15, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 15, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 15, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 15, 2023
@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 15, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 15, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 15, 2023
@emmileaf
Copy link
Contributor

emmileaf commented Feb 15, 2023 •
edited
Loading 

Compilation failure: Compilation failure: 
2023-02-15T21:24:28.2754903Z [ERROR] /home/runner/work/google-cloud-java/google-cloud-java/java-cloudbuild/google-cloud-build/src/test/java/google/devtools/cloudbuild/v2/MockIAMPolicyImpl.java:[21,39] package com.google.iam.v1.IAMPolicyGrpc does not exist
2023-02-15T21:24:28.2755883Z [ERROR] /home/runner/work/google-cloud-java/google-cloud-java/java-cloudbuild/google-cloud-build/src/test/java/google/devtools/cloudbuild/v2/MockIAMPolicyImpl.java:[36,40] cannot find symbol
2023-02-15T21:24:28.2756385Z [ERROR]   symbol: class IAMPolicyImplBase
2023-02-15T21:24:28.2757322Z [ERROR] /home/runner/work/google-cloud-java/google-cloud-java/java-cloudbuild/google-cloud-build/src/test/java/google/devtools/cloudbuild/v2/MockLocationsImpl.java:[20,47] package com.google.cloud.location.LocationsGrpc does not exist
2023-02-15T21:24:28.2758335Z [ERROR] /home/runner/work/google-cloud-java/google-cloud-java/java-cloudbuild/google-cloud-build/src/test/java/google/devtools/cloudbuild/v2/MockLocationsImpl.java:[30,40] cannot find symbol
2023-02-15T21:24:28.2758852Z [ERROR]   symbol: class LocationsImplBase
2023-02-15T21:24:28.2759156Z [ERROR] -> [Help 1]

Edit: missing dependencies need to be added manually to this PR.

@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 16, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 16, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 16, 2023
emmileaf
emmileaf reviewed Feb 16, 2023
View reviewed changes
java-cloudbuild/grpc-google-cloud-build-v2/pom.xml Outdated
Comment on lines 46 to 68
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Copy link
Contributor

@emmileaf emmileaf Feb 16, 2023

Choose a reason for hiding this comment

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

Per #8637, it seems like this block should not have been included in this generated pom?

Logs from failing generation diff / consolidate-config check:

diff --git a/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml b/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml
index 7e[5](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:6)[6](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:7)1eadc..fe7d400c1 100644
--- a/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml
+++ b/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml
@@ -42,2[8](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:9) +42,4 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>java[9](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:10)</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
 </project>
\ No newline at end of file
diff --git a/java-cloudbuild/proto-google-cloud-build-v2/pom.xml b/java-cloudbuild/proto-google-cloud-build-v2/pom.xml
index 434422f1c..f22d2eb45 100644
--- a/java-cloudbuild/proto-google-cloud-build-v2/pom.xml
+++ b/java-cloudbuild/proto-google-cloud-build-v2/pom.xml
@@ -34,13 +34,4 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
 </project>

Copy link
Contributor

@emmileaf emmileaf Feb 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Looks like this is a similar issue as #8860 (comment). Manually updating in ff40aa4.

@trusted-contributions-gcf trusted-contributions-gcf bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Feb 16, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Feb 16, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Feb 16, 2023
@emmileaf emmileaf requested a review from blakeli0 February 16, 2023 14:02
@emmileaf emmileaf merged commit bfc6efb into main Feb 16, 2023
@emmileaf emmileaf deleted the owl-bot-copy-java-cloudbuild branch February 16, 2023 15:57
@release-please release-please bot mentioned this pull request Feb 16, 2023
Merged
@alicejli alicejli mentioned this pull request Aug 31, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakeli0 blakeli0 blakeli0 approved these changes

+1 more reviewer

@emmileaf emmileaf emmileaf left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

owl-bot-copy

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@emmileaf @blakeli0 @yoshi-kokoro