Skip to content

build: fall back to previous image version on release PRs #12848

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
meltsufin merged 16 commits into from
Apr 21, 2026
Merged

build: fall back to previous image version on release PRs #12848

Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3c59412
build: fall back to previous image version on release PRs
meltsufin Apr 18, 2026
5fa7830
build: extract image name to variable in hermetic script
meltsufin Apr 18, 2026
823b98c
build: improve robustness of fallback version extraction
meltsufin Apr 18, 2026
c1395d2
build: prevent script termination on empty fallback match
meltsufin Apr 18, 2026
53d67a1
refactor: centralize generator docker execution and fallback logic
meltsufin Apr 21, 2026
16cfa1b
refactor: extract fallback tag from versions.txt instead of workflow …
meltsufin Apr 21, 2026
ef92609
refactor: remove unused gapic_generator_version from generation_confi…
meltsufin Apr 21, 2026
54269dc
fix: use remote ref origin/ for fallback tag extraction in CI
meltsufin Apr 21, 2026
b74fe50
Merge branch 'main' into release-please--fix-12825
meltsufin Apr 21, 2026
1ae26cc
fix: fetch target branch to get fallback tag in CI
meltsufin Apr 21, 2026
d19bfbb
Merge branch 'release-please--fix-12825' of github.com:googleapis/goo…
meltsufin Apr 21, 2026
43835e2
impl: add GENERATOR_VERSION to final stage of Dockerfile
meltsufin Apr 21, 2026
68519fb
chore: pass GENERATOR_VERSION to validation container in CI
meltsufin Apr 21, 2026
2cbaa3c
chore: pass GENERATOR_VERSION to hermetic_library_generation workflow
meltsufin Apr 21, 2026
7dc57e7
chore: generate libraries at Tue Apr 21 11:18:32 UTC 2026
cloud-java-bot Apr 21, 2026
d07cfd9
Merge branch 'main' into release-please--fix-12825
meltsufin Apr 21, 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
18 changes: 17 additions & 1 deletion sdk-platform-java/.github/scripts/hermetic_library_generation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ set -exo pipefail
# the default value is generation_config.yaml in the repository root.
# 5. [optional] showcase_mode, true if we wish to download the showcase api
# definitions, which are necessary for generating the showcase library.
IMAGE_NAME="gcr.io/cloud-devrel-public-resources/java-library-generation"
while [[ $# -gt 0 ]]; do
key="$1"
case "${key}" in
Expand Down Expand Up @@ -123,13 +124,28 @@ changed_libraries="$(cat "${changed_libraries_file}")"
echo "Changed libraries are: ${changed_libraries:-"No changed library"}."

# run hermetic code generation docker image.
# Attempt to pull the image to see if it exists on release PRs.
if [[ "$current_branch" =~ ^release-please-- ]]; then
Copy link
Copy Markdown
Contributor

@blakeli0 blakeli0 Apr 20, 2026

Choose a reason for hiding this comment

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

We could create release-please PRs from CLI as well.

Copy link
Copy Markdown
Member Author

@meltsufin meltsufin Apr 20, 2026

Choose a reason for hiding this comment

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

That's fine, as long as the branch prefix is release-please--.

Copy link
Copy Markdown
Contributor

@blakeli0 blakeli0 Apr 20, 2026

Choose a reason for hiding this comment

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

But that means we have to remember using release-please-- as the branch name, is there any harm we do this for every branches?

Copy link
Copy Markdown
Member Author

@meltsufin meltsufin Apr 21, 2026

Choose a reason for hiding this comment

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

You shouldn't have to use the Release Please CLI going forward which should eliminate the need to remember the branch prefix. The risk of always falling back is that if someone configures and invalid generator version, they won't get a CI failure as feedback.

echo "Detected release PR branch: $current_branch"
if ! docker pull "${IMAGE_NAME}:${image_tag}"; then
echo "Image not found for version ${image_tag}. Falling back to previous version from ${target_branch}."
previous_tag=$(git show "${target_branch}":.github/workflows/hermetic_library_generation.yaml | grep -m 1 "^[[:space:]]*image_tag:" | cut -d ':' -f 2- | cut -d '#' -f 1 | xargs || true)
Comment thread
suztomo marked this conversation as resolved.
Outdated
if [ -n "$previous_tag" ]; then
echo "Using previous image version: $previous_tag"
image_tag="$previous_tag"
else
echo "Failed to extract previous version from ${target_branch}. Proceeding with original tag."
fi
fi
fi

docker run \
--rm \
-u "$(id -u):$(id -g)" \
-v "$(pwd):${workspace_name}" \
-v "${api_def_dir}:${workspace_name}/googleapis" \
-e GENERATOR_VERSION="${image_tag}" \
gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \
"${IMAGE_NAME}:${image_tag}" \
--generation-config-path="${workspace_name}/${generation_config}" \
--library-names="${changed_libraries}" \
--api-definitions-path="${workspace_name}/googleapis"
Expand Down
Loading