From bf66d5b44a0682948e8bae8150638f87585e2c19 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 20 Apr 2026 19:29:04 +0000 Subject: [PATCH 1/5] chore: Stop referencing googleapis/sdk-platform-java --- .github/scripts/update_generation_config.sh | 19 ++++++++++++------- .../hermetic_library_generation.yaml | 2 +- .../workflows/unmanaged-dependency-check.yaml | 2 +- renovate.json | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index 74d0e6cc41..dd857f8d69 100644 --- a/.github/scripts/update_generation_config.sh +++ b/.github/scripts/update_generation_config.sh @@ -48,13 +48,14 @@ function update_config() { } # Update an action to a new version in GitHub action. +# the second argument must have the git tag (including "v"). function update_action() { local key_word=$1 local new_value=$2 local file=$3 echo "Update ${key_word} to ${new_value} in ${file}" # use a different delimiter because the key_word contains "/". - sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}" + sed -i -e "s|${key_word}@[^ ]*$|${key_word}@${new_value}|" "${file}" } # The parameters of this script is: @@ -143,12 +144,16 @@ rm -rf tmp-googleapis update_config "googleapis_commitish" "${latest_commit}" "${generation_config}" # Update gapic-generator-java version to the latest -latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java") -update_config "gapic_generator_version" "${latest_version}" "${generation_config}" - -# Update composite action version to latest gapic-generator-java version -update_action "googleapis/sdk-platform-java/.github/scripts" \ - "${latest_version}" \ +latest_gapic_generator_version=$(get_latest_released_version "com.google.api" "gapic-generator-java") +update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${generation_config}" + +# Update the GitHub Actions reference to the latest. +# After the google-cloud-java monorepo migration of sdk-platform-java, +# we cannot rely on the gapic-generator-java version tag. Let's use +# the shared dependencies BOM version +latest_shared_dependencies_bom_version=$(get_latest_released_version "com.google.cloud" "google-cloud-shared-dependencies") +update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \ + "google-cloud-shared-dependencies/v${latest_shared_dependencies_bom_version}" \ "${workflow}" # Update libraries-bom version to the latest diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index b6ae2e0705..425edd42f9 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0 + - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@google-cloud-shared-dependencies/v3.61.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/unmanaged-dependency-check.yaml b/.github/workflows/unmanaged-dependency-check.yaml index b7847082e4..411ece7cb7 100644 --- a/.github/workflows/unmanaged-dependency-check.yaml +++ b/.github/workflows/unmanaged-dependency-check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v1.85.0 + uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.61.0 with: bom-path: google-cloud-firestore-bom/pom.xml diff --git a/renovate.json b/renovate.json index a4117f5d7a..45439568cb 100644 --- a/renovate.json +++ b/renovate.json @@ -26,7 +26,7 @@ "fileMatch": [ "^.github/workflows/unmanaged-dependency-check.yaml$" ], - "matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"], + "matchStrings": ["uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"], "depNameTemplate": "com.google.cloud:sdk-platform-java-config", "datasourceTemplate": "maven" } From 2d65b79e0cde06796e1649ec2dfbcf6d406379b1 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 20 Apr 2026 21:26:22 +0000 Subject: [PATCH 2/5] empty change to trigger the hermetic build From b770fc66ec29ef6abcdf77a1fcbdfb772a88193f Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 20 Apr 2026 21:31:30 +0000 Subject: [PATCH 3/5] chore: generate libraries at Mon Apr 20 21:28:59 UTC 2026 --- .github/workflows/renovate_config_check.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 47b9e87c98..8c922936b9 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'renovate.json' + - '.github/workflows/renovate_config_check.yaml' jobs: renovate_bot_config_validation: @@ -18,8 +19,6 @@ jobs: with: node-version: '22' - - name: Install Renovate and Config Validator + - name: Run Renovate Config Validator run: | - npm install -g npm@latest - npm install --global renovate - renovate-config-validator + npx --package renovate@43.136.0 renovate-config-validator From 57b458f3a996e7fae885847ceae5d3a69f61833e Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Tue, 21 Apr 2026 17:40:56 +0000 Subject: [PATCH 4/5] chore: generate libraries at Tue Apr 21 17:38:38 UTC 2026 --- .github/scripts/update_generation_config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index dd857f8d69..f448fafd7d 100644 --- a/.github/scripts/update_generation_config.sh +++ b/.github/scripts/update_generation_config.sh @@ -150,10 +150,10 @@ update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${g # Update the GitHub Actions reference to the latest. # After the google-cloud-java monorepo migration of sdk-platform-java, # we cannot rely on the gapic-generator-java version tag. Let's use -# the shared dependencies BOM version -latest_shared_dependencies_bom_version=$(get_latest_released_version "com.google.cloud" "google-cloud-shared-dependencies") +# the gapic-libraries-bom version +latest_gapic_libraries_bom_version=$(get_latest_released_version "com.google.cloud" "gapic-libraries-bom") update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \ - "google-cloud-shared-dependencies/v${latest_shared_dependencies_bom_version}" \ + "v${latest_gapic_libraries_bom_version}" \ "${workflow}" # Update libraries-bom version to the latest From 47be6ac8a0b9551c7c4d75d311551d4022d12c89 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 21 Apr 2026 17:54:57 +0000 Subject: [PATCH 5/5] chore: Use gapic-libraries-bom version for tags --- .github/workflows/hermetic_library_generation.yaml | 2 +- .github/workflows/unmanaged-dependency-check.yaml | 2 +- renovate.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 425edd42f9..b6ae2e0705 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@google-cloud-shared-dependencies/v3.61.0 + - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/unmanaged-dependency-check.yaml b/.github/workflows/unmanaged-dependency-check.yaml index 411ece7cb7..b7847082e4 100644 --- a/.github/workflows/unmanaged-dependency-check.yaml +++ b/.github/workflows/unmanaged-dependency-check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.61.0 + uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v1.85.0 with: bom-path: google-cloud-firestore-bom/pom.xml diff --git a/renovate.json b/renovate.json index 45439568cb..5adbee08ae 100644 --- a/renovate.json +++ b/renovate.json @@ -26,8 +26,8 @@ "fileMatch": [ "^.github/workflows/unmanaged-dependency-check.yaml$" ], - "matchStrings": ["uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"], - "depNameTemplate": "com.google.cloud:sdk-platform-java-config", + "matchStrings": ["uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?.+?)\\n"], + "depNameTemplate": "com.google.cloud:gapic-libraries-bom", "datasourceTemplate": "maven" } ],