Merge branch 'main' into showcase-version-check-workflow

Author: sofisl

.github/workflows/ci.yaml

@@ -29,12 +29,22 @@ jobs:
     outputs:
       src: ${{ steps.filter.outputs.src }}
       ci: ${{ steps.filter.outputs.ci }}
+      # runnable is true if there are changes outside the .github/workflows directory OR if ci.yaml itself (or kokoro scripts) is modified.
+      runnable: ${{ fromJSON(steps.filter.outputs.all_count) > fromJSON(steps.filter.outputs.workflows_count) || fromJSON(steps.filter.outputs.ci_count) > 0 }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      # Use this action, rather than a file filter so that we can make this
+      # mandatory.
+      # See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#example-including-branches
+      # for more details.
     - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
       id: filter
       with:
         filters: |
+          all:
+            - '**'
+          workflows:
+            - '.github/workflows/**'
           src:
             - '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-spanner|java-storage)/**/*.java'
             - '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-spanner|java-storage)/**/pom.xml'
@@ -53,20 +63,25 @@ jobs:
     steps:
     - name: Get current week within the year
       id: date
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
     - uses: actions/checkout@v4
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     - uses: actions/setup-java@v4
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
     - run: java -version
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     - uses: actions/cache@v4
       id: mvn-cache
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
     - run: .kokoro/build.sh
-      if: ${{ needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true' }}
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' && (needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true') }}
       env:
         JOB_TYPE: test
         JOB_NAME: units-${{matrix.java}}
@@ -77,42 +92,50 @@ jobs:
     steps:
     - name: Get current week within the year
       id: date
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
     - uses: actions/checkout@v4
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     - uses: actions/setup-java@v4
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       with:
         java-version: 8
         distribution: temurin
     - name: "Set jvm system property environment variable for surefire plugin (unit tests)"
       # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
       # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
       shell: bash    
     - uses: actions/setup-java@v4
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       with:
         java-version: 11
         distribution: temurin
         cache: maven
     - uses: actions/cache@v4
       id: mvn-cache
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
     - run: .kokoro/build.sh
-      if: ${{ needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true' }}
+      if: ${{ needs.bulk-filter.outputs.runnable == 'true' && (needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true') }}
       shell: bash      
       env:
         JOB_TYPE: test
         JOB_NAME: units-8-runtime-${{matrix.java}}
   # detect which libraries have changed
   changes:
+    needs: bulk-filter
+    if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read
     outputs:
       packages: ${{ steps.filter.outputs.changes }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
       id: filter
       with:
@@ -302,7 +325,7 @@ jobs:
       env:
         BUILD_SUBDIR: ${{matrix.package}}
   required:
-    needs: [ changes, split-units, split-clirr, split-dependencies ]
+    needs: [ bulk-filter, changes, split-units, split-clirr, split-dependencies ]
     name: conditional-required-check
     if: ${{ always() }} # Always run even if any "needs" jobs fail
     runs-on: ubuntu-22.04
@@ -313,6 +336,8 @@ jobs:
       - name: Success otherwise
         run: echo "Success!"
   windows:
+    needs: bulk-filter
+    if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     runs-on: windows-latest
     steps:
     - name: Support longpaths
@@ -329,6 +354,8 @@ jobs:
         JOB_TYPE: test
         JOB_NAME: windows-units
   lint:
+    needs: bulk-filter
+    if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -345,6 +372,8 @@ jobs:
         HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
         BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.before }}
   enforcer:
+    needs: bulk-filter
+    if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     runs-on: ubuntu-latest
     steps:
     - name: Get current week within the year
@@ -364,6 +393,8 @@ jobs:
     - run: java -version
     - run: mvn -B -ntp enforcer:enforce@enforce -T 1C
   gapic-libraries-bom:
+    needs: bulk-filter
+    if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -381,6 +412,8 @@ jobs:
       with:
         bom-path: gapic-libraries-bom/pom.xml
   generation-config-check:
+    needs: bulk-filter
+    if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

.github/workflows/librarian_generation_check.yaml

@@ -0,0 +1,68 @@
+# Copyright 2026 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.
+name: Librarian generate diff check on pull requests
+on:
+  pull_request:
+
+jobs:
+  library_generation:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-go@v5
+      with:
+        go-version: 'stable'
+    - name: Install Librarian
+      run: |
+        V=$(go run github.com/googleapis/librarian/cmd/librarian@latest config get version)
+        echo "Installing librarian version $V"
+        go install github.com/googleapis/librarian/cmd/librarian@$V
+    - name: Install protoc
+      run: |
+        set -e
+        VERSION="33.2"
+        curl -fsSL --retry 5 --retry-delay 15 -o /tmp/protoc.zip "https://github.com/protocolbuffers/protobuf/releases/download/v$VERSION/protoc-$VERSION-linux-x86_64.zip"
+        cd /usr/local
+        sudo unzip -o /tmp/protoc.zip
+        protoc --version
+    - uses: actions/setup-java@v4
+      with:
+        java-version: "17"
+        distribution: "temurin"
+        cache: "maven"
+    - name: Verify Java and Maven installation
+      run: |
+        java -version
+        if ! command -v mvn &> /dev/null; then
+          sudo apt-get update && sudo apt-get install -y maven
+        fi
+        mvn -version
+    - uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+        cache: 'pip'
+    - name: Run librarian install
+      run: |
+        librarian install
+        echo "$HOME/java_tools/bin" >> $GITHUB_PATH
+    - name: Run librarian generate
+      env:
+        PYTHONPATH: ${{ github.workspace }}/sdk-platform-java/hermetic_build/library_generation/owlbot
+      run: |
+        librarian generate --all
+    - name: Check for generated code changes
+      run: |
+        git diff --exit-code

.github/workflows/sdk-platform-java-downstream_protobuf_compatibility_check_nightly.yaml

@@ -27,13 +27,10 @@ jobs:
       fail-fast: false
       matrix:
         repo:
-          - java-bigtable
-          - java-firestore
-          - java-pubsub
           - java-pubsublite
         # Default Protobuf-Java versions to use are specified here. Without this, the nightly workflow won't know
         # which values to use and would resolve to ''.
-        protobuf-version: ${{ fromJSON(format('[{0}]', inputs.protobuf_runtime_versions || '"4.33.5"')) }}
+        protobuf-version: ${{ fromJSON(format('[{0}]', inputs.protobuf_runtime_versions || '"4.35.0"')) }}
     steps:
       - name: Checkout sdk-platform-java repo
         uses: actions/checkout@v4

gapic-libraries-bom/pom.xml

@@ -560,6 +560,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-developer-knowledge-bom</artifactId>
+        <version>0.0.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-developer-knowledge:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-developerconnect-bom</artifactId>

generation/new_client_hermetic_build/add-new-client-config.py

@@ -61,10 +61,10 @@ def main(ctx):
     required=True,
     type=str,
     default=None,
-    help="Path to proto file from the root of the googleapis repository to the"
-    "directory that contains the proto files (without the version)."
+    help="Path to proto file from the root of the googleapis repository to the "
+    "directory that contains the proto files (including the version). "
     "For example, to generate the library for 'google/maps/routing/v2', "
-    "then you specify this value as 'google/maps/routing'",
+    "then you specify this value as 'google/maps/routing/v2'",
 )
 @click.option(
     "--product-docs",
@@ -221,9 +221,10 @@ def add_new_library(
     version_re = re.compile(r"v\d[\w\d]*")
     is_library_version = lambda p: version_re.match(p.split("/")[-1]) is not None
     if not is_library_version(proto_path):
-        raise ValueError(
-            "Only versioned proto_paths are supported. "
-            "For example `google/datastore/v1` instead of `google/datastore`."
+        print(
+            f"WARNING: proto_path '{proto_path}' does not end with a version (e.g., v1). "
+            "Please ensure this is intentional and that this represents a non-versioned "
+            "or custom proto path."
         )
 
     new_library = {