From ee77a6506550cbe4569cd854a64338d4e365f558 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 20 Apr 2026 19:29:48 +0000 Subject: [PATCH 1/6] 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 74d0e6cc4..dd857f8d6 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 9564231af..2375a720f 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 c2f165680..61e6c06ab 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -17,6 +17,6 @@ jobs: # repository .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-pubsub-bom/pom.xml diff --git a/renovate.json b/renovate.json index 7d5a289e6..b1954cd92 100644 --- a/renovate.json +++ b/renovate.json @@ -26,7 +26,7 @@ "^.github/workflows/unmanaged_dependency_check.yaml$" ], "matchStrings": [ - "uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n" + "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 f3d5617b2690361e2b844c5bf23321031f9f298a Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 20 Apr 2026 19:33:35 +0000 Subject: [PATCH 2/6] chore: generate libraries at Mon Apr 20 19:31:36 UTC 2026 --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index b1954cd92..91b1a27f7 100644 --- a/renovate.json +++ b/renovate.json @@ -26,9 +26,9 @@ "^.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" + "uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?.+?)\\n" ], - "depNameTemplate": "com.google.cloud:sdk-platform-java-config", + "depNameTemplate": "com.google.cloud:gapic-libraries-bom", "datasourceTemplate": "maven" } ], From dfec8ffef36e4e77ac39ad2ca8d9f160b482a243 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 20 Apr 2026 21:28:14 +0000 Subject: [PATCH 3/6] empty commit to trigger hermetic build From a385bd9a5fd113790834c4da7273c7a8bebb9ad5 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Mon, 20 Apr 2026 21:31:41 +0000 Subject: [PATCH 4/6] chore: generate libraries at Mon Apr 20 21:29:43 UTC 2026 --- .github/workflows/renovate_config_check.yaml | 7 +++---- renovate.json | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 47b9e87c9..8c922936b 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 diff --git a/renovate.json b/renovate.json index 91b1a27f7..0ad15bde6 100644 --- a/renovate.json +++ b/renovate.json @@ -26,9 +26,9 @@ "^.github/workflows/unmanaged_dependency_check.yaml$" ], "matchStrings": [ - "uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?.+?)\\n" + "uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n" ], - "depNameTemplate": "com.google.cloud:gapic-libraries-bom", + "depNameTemplate": "com.google.cloud:google-cloud-shared-dependencies", "datasourceTemplate": "maven" } ], From 448fa26f5db50865230989de83f2bef482c649b9 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Tue, 21 Apr 2026 17:41:01 +0000 Subject: [PATCH 5/6] chore: generate libraries at Tue Apr 21 17:39:00 UTC 2026 --- .github/scripts/update_generation_config.sh | 6 +++--- renovate.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/update_generation_config.sh b/.github/scripts/update_generation_config.sh index dd857f8d6..f448fafd7 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 diff --git a/renovate.json b/renovate.json index 0ad15bde6..91b1a27f7 100644 --- a/renovate.json +++ b/renovate.json @@ -26,9 +26,9 @@ "^.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" + "uses: googleapis/google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@v(?.+?)\\n" ], - "depNameTemplate": "com.google.cloud:google-cloud-shared-dependencies", + "depNameTemplate": "com.google.cloud:gapic-libraries-bom", "datasourceTemplate": "maven" } ], From 353cd83faef51d10a5daaa4bc6d58975610d3584 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 21 Apr 2026 17:56:00 +0000 Subject: [PATCH 6/6] chore: Use gapic-libraries-bom version for tags --- .github/workflows/hermetic_library_generation.yaml | 2 +- .github/workflows/unmanaged_dependency_check.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 2375a720f..9564231af 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 61e6c06ab..c2f165680 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -17,6 +17,6 @@ jobs: # repository .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-pubsub-bom/pom.xml