From 750d57ea1e2f706fda895635f297eeea4e430c74 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 26 Aug 2025 13:56:13 -0400 Subject: [PATCH 1/4] chore: Test with Protobuf-Java v4.32 [no need to review] --- .kokoro/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 37db5b473..5ac96dcb5 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -61,6 +61,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -Dprotobuf.version=4.32.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ From 0cda2e88d02d780aaa482e2efaf27d7437fcc4f4 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 10 Sep 2025 17:24:29 -0400 Subject: [PATCH 2/4] chore: Disable hermetic build generation --- .../hermetic_library_generation.yaml | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 04e4063f5..e67de2495 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -1,45 +1,45 @@ -# Copyright 2024 Google LLC +## Copyright 2024 Google LLC +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## GitHub action job to test core java library features on +## downstream client libraries before they are released. +#name: Hermetic library generation upon generation config change through pull requests +#on: +# pull_request: # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# GitHub action job to test core java library features on -# downstream client libraries before they are released. -name: Hermetic library generation upon generation config change through pull requests -on: - pull_request: - -env: - REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }} - GITHUB_REPOSITORY: ${{ github.repository }} -jobs: - library_generation: - runs-on: ubuntu-latest - steps: - - name: Determine whether the pull request comes from a fork - run: | - if [[ "${GITHUB_REPOSITORY}" != "${REPO_FULL_NAME}" ]]; then - echo "This PR comes from a fork. Skip library generation." - echo "SHOULD_RUN=false" >> $GITHUB_ENV - else - echo "SHOULD_RUN=true" >> $GITHUB_ENV - fi - - uses: actions/checkout@v4 - if: env.SHOULD_RUN == 'true' - with: - fetch-depth: 0 - token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.62.1 - if: env.SHOULD_RUN == 'true' - with: - base_ref: ${{ github.base_ref }} - head_ref: ${{ github.head_ref }} - token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} +#env: +# REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }} +# GITHUB_REPOSITORY: ${{ github.repository }} +#jobs: +# library_generation: +# runs-on: ubuntu-latest +# steps: +# - name: Determine whether the pull request comes from a fork +# run: | +# if [[ "${GITHUB_REPOSITORY}" != "${REPO_FULL_NAME}" ]]; then +# echo "This PR comes from a fork. Skip library generation." +# echo "SHOULD_RUN=false" >> $GITHUB_ENV +# else +# echo "SHOULD_RUN=true" >> $GITHUB_ENV +# fi +# - uses: actions/checkout@v4 +# if: env.SHOULD_RUN == 'true' +# with: +# fetch-depth: 0 +# token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} +# - uses: googleapis/sdk-platform-java/.github/scripts@v2.61.0 +# if: env.SHOULD_RUN == 'true' +# with: +# base_ref: ${{ github.base_ref }} +# head_ref: ${{ github.head_ref }} +# token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} From 8913ae5f30d2ad762ace5a9a74972a482e51ab32 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 24 Sep 2025 11:24:23 -0400 Subject: [PATCH 3/4] chore: Update to Protobuf 4.32.1 --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 5ac96dcb5..34e2086df 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -61,7 +61,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ - -Dprotobuf.version=4.32.0 \ + -Dprotobuf.version=4.32.1 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ From d2b2585d40420028efbe250853fac18ea9f449fc Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 21 Oct 2025 16:35:21 -0400 Subject: [PATCH 4/4] Update protobuf.version to 4.33.0 --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 34e2086df..33cf060dd 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -61,7 +61,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ - -Dprotobuf.version=4.32.1 \ + -Dprotobuf.version=4.33.0 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \