Skip to content

ci: fix library generation presubmit #12803

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.

Sign up for GitHub

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

Merged
chingor13 merged 6 commits into from
Apr 15, 2026
Merged

ci: fix library generation presubmit #12803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa8e1a8
build: fix library generation cloudbuild paths
chingor13 Apr 14, 2026
7d5579d
fix build
chingor13 Apr 14, 2026
160195e
fix test mount directory
chingor13 Apr 14, 2026
3f3d061
fix python test path
chingor13 Apr 14, 2026
6f27f57
Merge branch 'main' into library-generation-tests
chingor13 Apr 14, 2026
64656e5
chore: generate libraries at Tue Apr 14 22:36:41 UTC 2026
cloud-java-bot Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gapic-libraries-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>gapic-libraries-bom</artifactId>
<packaging>pom</packaging>
<version>1.85.1</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.85.0</version><!-- {x-version-update:google-cloud-java:current} -->
<name>Google Cloud Java BOM</name>
<description>
BOM for the libraries in google-cloud-java repository. Users should not
Expand Down
6 changes: 3 additions & 3 deletions ...m-java/.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
# Use a fixed protoc version so that the generation result stays the same
"--build-arg", "PROTOC_VERSION=25.8",
"-t", "${_TEST_IMAGE}",
"-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
"-f", "sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile",
"."
]
id: build-image
Expand Down Expand Up @@ -82,7 +82,7 @@ steps:
"run",
"--rm",
"-v", "/workspace/google-cloud-java:/workspace",
"-v", "/workspace/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config",
"-v", "/workspace/sdk-platform-java/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config",
"-v", "/workspace/googleapis:/workspace/apis",
# Fix gapic-generator-java so that the generation result stays
# the same.
Expand Down Expand Up @@ -110,7 +110,7 @@ steps:
source .venv/bin/activate
pip install --require-hashes -r requirements.txt
python -m unittest integration_tests.py
dir: ".cloudbuild/library_generation/scripts"
dir: "sdk-platform-java/.cloudbuild/library_generation/scripts"
id: verify-generation
waitFor: ["generate-libraries"]
options:
Expand Down
2 changes: 1 addition & 1 deletion ...form-java/.cloudbuild/library_generation/cloudbuild-library-generation-push-exitgate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ steps:
"build",
"-t", "${_SHA_IMAGE_ID}",
"-t", "${_VERSIONED_IMAGE_ID}",
"-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
"-f", "sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile",
Comment thread
chingor13 marked this conversation as resolved.
"."
]
id: library-generation-build
Expand Down
4 changes: 2 additions & 2 deletions sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https
# Compile and install packages
RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make
RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
"./gapic-generator-java.jar"
"/gapic-generator-java.jar"

FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final

Expand Down Expand Up @@ -94,7 +94,7 @@ ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar"
# Note that the destination is a well-known location that will be assumed at runtime
# We hard-code the location string to avoid making it configurable (via ARG) as
# well as to avoid it making it overridable at runtime (via ENV).
COPY --from=ggj-build "/google-cloud-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
COPY --from=ggj-build "/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar"
ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar"

Expand Down
13 changes: 7 additions & 6 deletions sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,22 @@
# 3.9.9-eclipse-temurin-11-alpine
FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f04985c6a68415e36c0a6468d0f8316f27d4dbee77bc459257ba444224bd9f AS ggj-build

WORKDIR /sdk-platform-java
COPY sdk-platform-java/ .
Copy link
Copy Markdown
Contributor

@diegomarquezp diegomarquezp Apr 15, 2026

Choose a reason for hiding this comment

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

Why wouldn't the more narrow copy work here?

Copy link
Copy Markdown
Contributor Author

@chingor13 chingor13 Apr 15, 2026

Choose a reason for hiding this comment

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

sdk-platform-java also depends on google-auth-library which is part of the monorepo

WORKDIR /google-cloud-java

COPY . .
# {x-version-update-start:gapic-generator-java:current}
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.71.0"
# {x-version-update-end}

# Download the java formatter
RUN mvn -pl gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
RUN mvn -pl sdk-platform-java/gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
RUN cat /java-formatter-version
RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar"

# Skipping the fmt check until 3.9.9-eclipse-temurin-17-alpine:969014ee8852 is available in Airlock.
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make
RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
"./gapic-generator-java.jar"
"/gapic-generator-java.jar"

# 3.12.3-slim-bookworm
FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
Expand Down Expand Up @@ -94,7 +95,7 @@ ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar"
# Note that the destination is a well-known location that will be assumed at runtime
# We hard-code the location string to avoid making it configurable (via ARG) as
# well as to avoid it making it overridable at runtime (via ENV).
COPY --from=ggj-build "/sdk-platform-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
COPY --from=ggj-build "/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar"
ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar"

Expand Down
Loading