Skip to content

Commit 594c587

Browse files
chore(hermetic-build): update final base image and owlbot dependency (#3385)
Updates the _final_ base image to the latest as well as the owlbot CLI dependency. --------- Co-authored-by: Joe Wang <[email protected]>
1 parent cf32e72 commit 594c587

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.cloudbuild/library_generation/library_generation.Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,9 @@ RUN chmod a+x compile-x86_64-alpine-linux.sh
5050
RUN sh compile-x86_64-alpine-linux.sh
5151

5252
# python:3.12.7-alpine3.20
53-
FROM docker.io/library/python@sha256:38e179a0f0436c97ecc76bcd378d7293ab3ee79e4b8c440fdc7113670cb6e204 as final
53+
FROM docker.io/library/python@sha256:5049c050bdc68575a10bcb1885baa0689b6c15152d8a56a7e399fb49f783bf98 as final
5454

55-
56-
57-
ARG OWLBOT_CLI_COMMITTISH=38fe6f89a2339ee75c77739b31b371f601b01bb3
55+
ARG OWLBOT_CLI_COMMITTISH=ab222d9a20bb27586433caedc70f049b7853db7e
5856
ARG PROTOC_VERSION=25.5
5957
ARG GRPC_VERSION=1.68.1
6058
ARG JAVA_FORMAT_VERSION=1.7
@@ -126,6 +124,7 @@ RUN git checkout "${OWLBOT_CLI_COMMITTISH}"
126124
RUN npm i && npm run compile && npm link
127125
RUN owl-bot copy-code --version
128126
RUN chmod o+rx $(which owl-bot)
127+
RUN apk del -r npm && apk cache clean
129128

130129
# download the Java formatter
131130
ADD https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${JAVA_FORMAT_VERSION}/google-java-format-${JAVA_FORMAT_VERSION}-all-deps.jar \

.github/workflows/hermetic_library_generation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: |
5252
GENERATOR_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -pl gapic-generator-java)
5353
echo "GENERATOR_VERSION=${GENERATOR_VERSION}" >> "$GITHUB_ENV"
54-
docker build \
54+
DOCKER_BUILDKIT=1 docker build \
5555
-f .cloudbuild/library_generation/library_generation.Dockerfile \
5656
-t gcr.io/cloud-devrel-public-resources/java-library-generation:"${GENERATOR_VERSION}" \
5757
.

.github/workflows/verify_library_generation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
git checkout -b "${head_ref}" fork/${head_ref}
2828
changed_directories="$(git diff --name-only "fork/${head_ref}" "origin/${base_ref}")"
2929
fi
30-
if [[ ${changed_directories} =~ "hermetic_build/" ]]; then
30+
if [[ ${changed_directories} =~ "hermetic_build/" ]] || [[ ${changed_directories} =~ ".cloudbuild/library_generation/" ]]; then
3131
echo "should_run=true" >> $GITHUB_OUTPUT
3232
else
3333
echo "should_run=false" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)