Merge branch 'main' into feat/deleteSourceObjects-compose-10602500430278326901

Author: nidhiii-27

.github/workflows/ci.yaml

@@ -321,13 +321,13 @@ jobs:
     - name: validate generation configuration
       shell: bash
       run: |
-        docker run \
-          --rm \
+        bash generation/run_generator_docker.sh "${library_generation_image_tag}" "${{ github.base_ref || 'main' }}" \
+          -e GENERATOR_VERSION="${library_generation_image_tag}" \
           --quiet \
           -u "$(id -u):$(id -g)" \
           -v "$(pwd):${workspace_name}" \
           --entrypoint python \
-          gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
+          -- \
           /src/library_generation/cli/entry_point.py validate-generation-config
       env:
         library_generation_image_tag: 2.68.0

.github/workflows/generated_files_sync.yaml

@@ -27,13 +27,12 @@ jobs:
     - name: Generate root pom.xml file
       shell: bash
       run: |
-        docker run \
-          --rm \
+        bash generation/run_generator_docker.sh "${library_generation_image_tag}" "${{ github.base_ref }}" \
           --quiet \
           -u "$(id -u):$(id -g)" \
           -v "$(pwd):/workspace" \
           --entrypoint python \
-          gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
+          -- \
           /src/library_generation/cli/generate_monorepo_root_pom.py \
           generate \
           --repository-path=/workspace
@@ -48,13 +47,12 @@ jobs:
     - name: Generate gapic-libraries-bom/pom.xml
       shell: bash
       run: |
-        docker run \
-          --rm \
+        bash generation/run_generator_docker.sh "${library_generation_image_tag}" "${{ github.base_ref }}" \
           --quiet \
           -u "$(id -u):$(id -g)" \
           -v "$(pwd):/workspace" \
           --entrypoint python \
-          gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
+          -- \
           /src/library_generation/cli/generate_monorepo_gapic_bom.py \
           generate \
           --repository-path=/workspace \

…form-java-verify_library_generation.yaml …workflows/hermetic-build-scripts-ci.yaml.github/workflows/sdk-platform-java-verify_library_generation.yaml renamed to .github/workflows/hermetic-build-scripts-ci.yaml .github/workflows/sdk-platform-java-verify_library_generation.yaml renamed to .github/workflows/hermetic-build-scripts-ci.yaml

@@ -1,9 +1,7 @@
 on:
   pull_request:
 
-name: sdk-platform-java verify_library_generation
-env:
-  BUILD_SUBDIR: sdk-platform-java
+name: hermetic build scripts
 jobs:
   filter:
     runs-on: ubuntu-latest
@@ -16,48 +14,14 @@ jobs:
       with:
         filters: |
           library:
-            - 'sdk-platform-java/**'
-  should-run-library-generation-tests:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
-    runs-on: ubuntu-22.04
-    outputs:
-      should_run: ${{ steps.get_changed_directories.outputs.should_run }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: get changed directories in the pull request
-      id: get_changed_directories
-      shell: bash
-      run: |
-        set -ex
-        # PRs that come from a fork need to be handled differently
-        if [[ ${head_repo_name} == ${base_repo} ]]; then
-          git checkout ${base_ref}
-          git checkout ${head_ref}
-          changed_directories="$(git diff --name-only ${base_ref} ${head_ref})"
-        else
-          git remote add fork ${head_repo_url}
-          git fetch fork # create a mapping of the fork
-          git checkout -b "${head_ref}" fork/${head_ref}
-          changed_directories="$(git diff --name-only "fork/${head_ref}" "origin/${base_ref}")"
-        fi
-        if [[ ${changed_directories} =~ "sdk-platform-java/hermetic_build/" ]] || [[ ${changed_directories} =~ "sdk-platform-java/.cloudbuild/library_generation/" ]]; then
-          echo "should_run=true" >> $GITHUB_OUTPUT
-        else
-          echo "should_run=false" >> $GITHUB_OUTPUT
-        fi
-      env:
-        base_ref: ${{ github.event.pull_request.base.ref }}
-        head_ref: ${{ github.event.pull_request.head.ref }}
-        head_repo_url: ${{ github.event.pull_request.head.repo.html_url }}
-        head_repo_name: ${{ github.event.pull_request.head.repo.full_name  }}
-        base_repo: ${{ github.repository }}
+            - 'sdk-platform-java/hermetic_build/**'
+            - 'sdk-platform-java/.cloudbuild/library_generation/**'
+            - '.github/workflows/hermetic-build-scripts-ci.yaml'
   library-generation-unit-tests:
-    needs: [filter, should-run-library-generation-tests]
-    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
+    needs: filter
+    if: needs.filter.outputs.library == 'true'
     runs-on: ubuntu-22.04
+    name: hermetic build units (python)
     defaults:
       run:
         working-directory: sdk-platform-java
@@ -86,9 +50,10 @@ jobs:
         set -x
         python -m unittest discover -s hermetic_build -p "*unit_tests.py"
   library-generation-lint-shell:
-    needs: [filter, should-run-library-generation-tests]
-    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
+    needs: filter
+    if: needs.filter.outputs.library == 'true'
     runs-on: ubuntu-22.04
+    name: hermetic build lint (shell)
     defaults:
       run:
         working-directory: sdk-platform-java
@@ -103,9 +68,10 @@ jobs:
         ignore_paths: 
           .kokoro
   library-generation-lint-python:
-    needs: [filter, should-run-library-generation-tests]
-    if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true'
+    needs: filter
+    if: needs.filter.outputs.library == 'true'
     runs-on: ubuntu-22.04
+    name: hermetic build lint (python)
     defaults:
       run:
         working-directory: sdk-platform-java

.github/workflows/hermetic_library_generation.yaml

@@ -20,6 +20,9 @@ on:
 env:
   REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
   GITHUB_REPOSITORY: ${{ github.repository }}
+  # {x-version-update-start:gapic-generator-java:current}
+  GENERATOR_VERSION: 2.71.0
+  # {x-version-update-end}
 jobs:
   library_generation:
     runs-on: ubuntu-latest
@@ -44,4 +47,4 @@ jobs:
         head_ref: ${{ github.head_ref }}
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         force_regenerate_all: ${{ github.event.pull_request.head.ref == 'generate-libraries-main' }}
-        image_tag: 2.71.0  # {x-version-update:gapic-generator-java:current}
+        image_tag: ${{ env.GENERATOR_VERSION }}