From 27cea12014faa722b911bd92f55fe07b8455d99e Mon Sep 17 00:00:00 2001
From: chingor13 <chingor@google.com>
Date: Wed, 22 Apr 2026 19:41:28 +0000
Subject: [PATCH 1/4] ci: run clirr on auth-library and sdk-platform-java

---
 .../workflows/google-auth-library-java-ci.yaml | 18 +++++++++++++++++-
 .github/workflows/sdk-platform-java-ci.yaml    | 16 ++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/google-auth-library-java-ci.yaml b/.github/workflows/google-auth-library-java-ci.yaml
index 1f1ff7e78467..7abb290ab4d6 100644
--- a/.github/workflows/google-auth-library-java-ci.yaml
+++ b/.github/workflows/google-auth-library-java-ci.yaml
@@ -55,8 +55,24 @@ jobs:
         BUILD_SUBDIR: google-auth-library-java
         JOB_TYPE: test
         SUREFIRE_JVM_OPT: "-P '!slf4j2x,slf4j2x-test'"
+  clirr:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: clirr
+        BUILD_SUBDIR: google-auth-library-java
+
   required:
-    needs: [ units-logging ]
+    needs: [ units-logging, clirr ]
     name: conditional-required-check
     if: ${{ always() }} # Always run even if any "needs" jobs fail
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/sdk-platform-java-ci.yaml b/.github/workflows/sdk-platform-java-ci.yaml
index bfd07bfa7475..5b5a0bb3202a 100644
--- a/.github/workflows/sdk-platform-java-ci.yaml
+++ b/.github/workflows/sdk-platform-java-ci.yaml
@@ -53,6 +53,22 @@ jobs:
           GOOGLE_SDK_JAVA_LOGGING: true
         working-directory: sdk-platform-java
 
+  clirr:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    - run: java -version
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: clirr
+        BUILD_SUBDIR: sdk-platform-java
+
   sdk-platform-java-8:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

From 556a3048c7ba36948bde2c1ff81a9e506d7be046 Mon Sep 17 00:00:00 2001
From: chingor13 <chingor@google.com>
Date: Wed, 22 Apr 2026 20:16:07 +0000
Subject: [PATCH 2/4] run clirr check

---
 .kokoro/build.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 305c16edf5b0..bd069460cbd5 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -305,6 +305,28 @@ case ${JOB_TYPE} in
       popd
     fi
     ;;
+  clirr)
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "Compiling and building all modules for ${BUILD_SUBDIR}"
+      install_modules "${BUILD_SUBDIR}"
+      echo "Running in subdir: ${BUILD_SUBDIR}"
+      pushd "${BUILD_SUBDIR}"
+      EXTRA_PROFILE_OPTS=()
+    else
+      install_modules "sdk-platform-java"
+    fi
+    mvn -B -ntp \
+      -Dfmt.skip=true \
+      -Denforcer.skip=true \
+      clirr:check
+    RETURN_CODE=$?
+    if [[ -n "${BUILD_SUBDIR}" ]]
+    then
+      echo "restoring directory"
+      popd
+    fi
+    ;;
   *) ;;
 
 esac

From 04524a25c376efc5c5ba6eca9b42071b78336fbc Mon Sep 17 00:00:00 2001
From: chingor13 <chingor@google.com>
Date: Wed, 22 Apr 2026 20:24:48 +0000
Subject: [PATCH 3/4] skip checkstyle

---
 .kokoro/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index bd069460cbd5..3691dd9a0a3f 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -319,6 +319,7 @@ case ${JOB_TYPE} in
     mvn -B -ntp \
       -Dfmt.skip=true \
       -Denforcer.skip=true \
+      -Dcheckstyle.skip=true \
       clirr:check
     RETURN_CODE=$?
     if [[ -n "${BUILD_SUBDIR}" ]]

From 4fe0cc5a5f70eb576f2a59029d4edeead098751d Mon Sep 17 00:00:00 2001
From: chingor13 <chingor@google.com>
Date: Wed, 22 Apr 2026 21:16:32 +0000
Subject: [PATCH 4/4] also run clirr on migrated handwrittens

---
 .github/workflows/ci.yaml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65d84a8e06b7..16bf8ce4ead4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -246,8 +246,28 @@ jobs:
         JOB_TYPE: test
         JOB_NAME: units-8-runtime-${{matrix.java}}
       working-directory: ${{matrix.package}}
+  split-clirr:
+    runs-on: ubuntu-latest
+    needs: changes
+    strategy:
+      matrix:
+        package: ${{ fromJSON(needs.changes.outputs.packages) }}
+    steps:
+    - name: Get current week within the year
+      id: date
+      run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
+    - run: .kokoro/build.sh
+      env:
+        BUILD_SUBDIR: ${{matrix.package}}
+        JOB_TYPE: clirr
+        JOB_NAME: clirr-${{matrix.package}}
   required:
-    needs: [ changes, split-units ]
+    needs: [ changes, split-units, split-clirr ]
     name: conditional-required-check
     if: ${{ always() }} # Always run even if any "needs" jobs fail
     runs-on: ubuntu-22.04