chore: bake protoc into the hermetic build docker image #2707
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
There was a problem hiding this comment. Since this is a test resource, could you remove all unused part? There was a problem hiding this comment. My bad, it slipped into my commits! |
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>com.google.api</groupId> | ||
| <artifactId>gapic-generator-java-pom-parent</artifactId> | ||
| <version>2.24.0</version><!-- {x-version-update:gapic-generator-java:current} --> | ||
| <packaging>pom</packaging> | ||
| <name>GAPIC Generator Java POM Parent</name> | ||
| <url>https://github.com/googleapis/sdk-platform-java</url> | ||
| <description> | ||
| The top-level parent for all modules in the repository. | ||
| </description> | ||
| <parent> | ||
| <groupId>com.google.cloud</groupId> | ||
| <artifactId>google-cloud-shared-config</artifactId> | ||
| <version>1.5.7</version> | ||
| <relativePath/> | ||
| </parent> | ||
|
|
||
| <properties> | ||
| <skipUnitTests>false</skipUnitTests> | ||
| <checkstyle.header.file>java.header</checkstyle.header.file> | ||
|
|
||
| <!-- External dependencies, especially gRPC and Protobuf version, should be | ||
| consistent across modules in this repository --> | ||
| <javax.annotation-api.version>1.3.2</javax.annotation-api.version> | ||
| <auto-value.version>1.10.2</auto-value.version> | ||
| <grpc.version>1.56.1</grpc.version> | ||
| <google.auth.version>1.19.0</google.auth.version> | ||
| <google.http-client.version>1.43.3</google.http-client.version> | ||
| <gson.version>2.10.1</gson.version> | ||
| <guava.version>32.1.2-jre</guava.version> | ||
| <!-- On next protobuf upgrade (to 3.23.3 or higher), | ||
| remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies. | ||
| For context: https://github.com/googleapis/sdk-platform-java/pull/1791--> | ||
| <protobuf.version>3.23.2</protobuf.version> | ||
| <maven.compiler.release>8</maven.compiler.release> | ||
| </properties> | ||
|
|
||
| <developers> | ||
| <developer> | ||
| <id>suztomo</id> | ||
| <name>Tomo Suzuki</name> | ||
| <email>[email protected]</email> | ||
| <organization>Google</organization> | ||
| <roles> | ||
| <role>Developer</role> | ||
| </roles> | ||
| </developer> | ||
| </developers> | ||
| <organization> | ||
| <name>Google LLC</name> | ||
| </organization> | ||
| <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" | ||
| child.scm.url.inherit.append.path="false"> | ||
| <connection>scm:git:[email protected]:googleapis/sdk-platform-java.git</connection> | ||
| <developerConnection>scm:git:[email protected]:googleapis/sdk-platform-java.git</developerConnection> | ||
| <url>https://github.com/googleapis/sdk-platform-java</url> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <issueManagement> | ||
| <url>https://github.com/googleapis/sdk-platform-java/issues</url> | ||
| <system>GitHub Issues</system> | ||
| </issueManagement> | ||
|
|
||
| <licenses> | ||
| <license> | ||
| <name>Apache-2.0</name> | ||
| <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> | ||
| </license> | ||
| </licenses> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <!-- Only run checkstyle plugin on Java 11+ (checkstyle artifact only supports Java 11+) --> | ||
| <id>checkstyle-tests</id> | ||
| <activation> | ||
| <jdk>[11,)</jdk> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-checkstyle-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>checkstyle</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>check</goal> | ||
| </goals> | ||
| <configuration> | ||
| <headerLocation>${checkstyle.header.file}</headerLocation> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
| <id>test-coverage</id> | ||
| <activation> | ||
| <property> | ||
| <name>enableShowcaseTestCoverage</name> | ||
| </property> | ||
| </activation> | ||
| <build> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>3.0.0-M8</version> | ||
| <configuration> | ||
| <!-- Excludes integration tests and smoke tests when unit tests are run --> | ||
| <excludes> | ||
| <exclude>**/*SmokeTest.java</exclude> | ||
| <exclude>**/IT*.java</exclude> | ||
| </excludes> | ||
| <reportNameSuffix>sponge_log</reportNameSuffix> | ||
| <argLine>${surefire.jacoco.args}</argLine> | ||
| <skipTests>${skipUnitTests}</skipTests> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-failsafe-plugin</artifactId> | ||
| <version>3.0.0</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>integration-test</goal> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> | ||
| <reportNameSuffix>sponge_log</reportNameSuffix> | ||
| <includes> | ||
| <include>**/IT*.java</include> | ||
| <include>**/*SmokeTest.java</include> | ||
| </includes> | ||
| <argLine>${failsafe.jacoco.args}</argLine> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.jacoco</groupId> | ||
| <artifactId>jacoco-maven-plugin</artifactId> | ||
| <version>0.8.8</version> | ||
| <executions> | ||
| <execution> | ||
| <id>unit-test-execution</id> | ||
| <goals> | ||
| <goal>prepare-agent</goal> | ||
| </goals> | ||
| <configuration> | ||
| <propertyName>surefire.jacoco.args</propertyName> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>integration-test-execution</id> | ||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>prepare-agent</goal> | ||
| </goals> | ||
| <configuration> | ||
| <propertyName>failsafe.jacoco.args</propertyName> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| <repositories> | ||
| <repository> | ||
| <id>google-maven-central-copy</id> | ||
| <name>Google Maven Central copy</name> | ||
| <url>https://maven-central.storage-download.googleapis.com/maven2</url> | ||
| </repository> | ||
| <repository> | ||
| <id>maven-central</id> | ||
| <name>Maven Central</name> | ||
| <url>https://repo1.maven.org/maven2</url> | ||
| </repository> | ||
| </repositories> | ||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,18 @@ | |
| "depNameTemplate": "com.google.protobuf:protobuf-java", | ||
| "datasourceTemplate": "maven" | ||
| }, | ||
| { | ||
| "customType": "regex", | ||
| "fileMatch": [ | ||
| "^\\.cloudbuild/library_generation/library_generation\\.Dockerfile$" | ||
|
There was a problem hiding this comment. Do you verify this setting will work? Do we need to specify There was a problem hiding this comment. @JoeWang1127 I verified it worked locally. I added the results to the PR description. There was a problem hiding this comment. Actually we probably don't want to let renovate bot to automatically update protoc. Not before we can update the whole repo(java-comon-protos, java-iam, test files in gapic-generator-java) along side the protoc update. Because the new protoc version may not work with the current protos or the newly generated code may not work with the generator. There was a problem hiding this comment. Sounds good. Both sdk-platform-java/renovate.json Lines 154 to 161 in eb48f45 I guess we can keep these regexes and enable them afterwards? |
||
| ], | ||
| "matchStrings": [ | ||
| "ARG PROTOC_VERSION=[\"']?(?<currentValue>.+?)[\"']?\\s+" | ||
| ], | ||
| "datasourceTemplate": "github-releases", | ||
| "depNameTemplate": "protocolbuffers/protobuf", | ||
| "extractVersionTemplate": "^v(?<version>.*)$" | ||
| }, | ||
| { | ||
| "customType": "regex", | ||
| "fileMatch": [ | ||
|
|
@@ -141,7 +153,8 @@ | |
| }, | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^com.google.protobuf", | ||
| "^protocolbuffers/protobuf" | ||
| ], | ||
| "groupName": "Protobuf dependencies", | ||
| "enabled": false | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anything requires us to change the default shell to bash?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
nvminstallation script assumes the environment isbashbased. Usingshmakes the following line to have no effects.sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile
Line 63 in 5e71efa