Merge branch 'release-please--fix-12825' into release-please--simulation

Author: meltsufin

generation/run_generator_docker.sh

@@ -46,8 +46,9 @@ if [[ "$CURRENT_BRANCH" =~ ^release-please-- ]]; then
   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}."
-    # Extract tag from target branch's versions.txt
-    PREVIOUS_TAG=$(git show origin/"${TARGET_BRANCH}":versions.txt | grep "^gapic-generator-java:" | cut -d ':' -f 2 || true)
+    # Extract tag from target branch's versions.txt using explicit fetch
+    git fetch origin "${TARGET_BRANCH}" --depth=1 || true
+    PREVIOUS_TAG=$(git show FETCH_HEAD:versions.txt | grep "^gapic-generator-java:" | cut -d ':' -f 2 || true)
     if [ -n "$PREVIOUS_TAG" ]; then
       echo "Using previous image version: $PREVIOUS_TAG"
       IMAGE_TAG="$PREVIOUS_TAG"

sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile

@@ -43,6 +43,10 @@ ARG GRPC_VERSION=1.80.0
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 
+# {x-version-update-start:gapic-generator-java:current}
+ENV GENERATOR_VERSION="2.71.0"
+# {x-version-update-end}
+
 # install OS tools
 RUN apt update && apt install -y curl unzip rsync jq nodejs npm git openjdk-17-jdk