From 26887441dabadce0db935a125154b3f400470e88 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 7 May 2025 14:34:25 -0400 Subject: [PATCH 1/6] chore: Run with v4.29.4 --- .kokoro/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 63ae42ebf8..364091d763 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -63,6 +63,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.29.4 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ From 29eb875e2ac6b9590c658320eb184756bca62715 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Wed, 7 May 2025 19:52:46 +0000 Subject: [PATCH 2/6] chore: generate libraries at Wed May 7 19:50:17 UTC 2025 --- .kokoro/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 364091d763..63ae42ebf8 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -63,7 +63,6 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.29.4 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ From 54d71d9c04e40521c22fe8008840db14d6ab7dbc Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 18 Mar 2025 14:10:47 -0400 Subject: [PATCH 3/6] chore: running integration test with Protobuf 4.29.3 --- .kokoro/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 63ae42ebf8..3cc44de5b6 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -63,6 +63,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ + -Dprotobuf.version=4.29.3 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ From 8cdeb304a20830f275208c9de9b599389fbca3e1 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 24 Apr 2025 13:22:25 -0400 Subject: [PATCH 4/6] chore: Resolve merge conflicts --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 3cc44de5b6..364091d763 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -63,7 +63,7 @@ javadoc) integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ - -Dprotobuf.version=4.29.3 \ + -Dprotobuf.version=4.29.4 \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ From ea59d4bf7880811c18177a0a764b9f1672ba7619 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 14:57:48 -0400 Subject: [PATCH 5/6] chore(main): release 2.59.0 (#2585) * chore(main): release 2.59.0 * chore: generate libraries at Fri May 16 17:31:37 UTC 2025 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot From a0d230260055ef5feaa57224df36300eee397387 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 5 Jun 2025 17:17:41 -0400 Subject: [PATCH 6/6] chore: Update to Protobuf v4.29.4 --- .../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 336ac2c8ca..88c26b1d17 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.58.0 - 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.58.0 +# if: env.SHOULD_RUN == 'true' +# with: +# base_ref: ${{ github.base_ref }} +# head_ref: ${{ github.head_ref }} +# token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}