From f09c2e88f814b4789acde82d38c94a0824776b96 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 15 Apr 2026 13:01:52 -0400 Subject: [PATCH 1/6] fix: use pre-monorepo setup for split units --- .github/workflows/ci.yaml | 16 ++++++++++------ release-please | 1 + sdk-platform-java/tracing-sample | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) create mode 160000 release-please create mode 160000 sdk-platform-java/tracing-sample diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c164c3c4fa39..fdf4b1fda343 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -209,6 +209,13 @@ jobs: id: date run: echo "::set-output name=week_of_year::$(date +'%W' --utc)" - uses: actions/checkout@v4 + # Java 8 tests use JDK 11 to compile and JDK 8 to run tests. + # Setting up Java 8 first to capture JAVA8_HOME. + - uses: actions/setup-java@v4 + with: + java-version: ${{matrix.java}} + distribution: temurin + - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV - uses: actions/setup-java@v4 with: java-version: 11 @@ -226,11 +233,7 @@ jobs: env: BUILD_SUBDIR: ${{matrix.package}} JOB_TYPE: install - - uses: actions/setup-java@v4 - with: - java-version: ${{matrix.java}} - distribution: temurin - - run: java -version + - name: Run tests in Java ${{matrix.java}} with the source compiled in Java 11 run: | mvn test \ @@ -240,7 +243,8 @@ jobs: -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -Dmaven.wagon.http.retryHandler.count=5 \ --also-make \ - -T 1C + -T 1C \ + -Djvm="${JAVA8_HOME}/bin/java" env: BUILD_SUBDIR: ${{matrix.package}} JOB_TYPE: test diff --git a/release-please b/release-please new file mode 160000 index 000000000000..d464e48c84a0 --- /dev/null +++ b/release-please @@ -0,0 +1 @@ +Subproject commit d464e48c84a043c88a483aa0bbdc4490757042a8 diff --git a/sdk-platform-java/tracing-sample b/sdk-platform-java/tracing-sample new file mode 160000 index 000000000000..9712ecf5c5c7 --- /dev/null +++ b/sdk-platform-java/tracing-sample @@ -0,0 +1 @@ +Subproject commit 9712ecf5c5c76d3d671c3f76db55d6eb3a72db1a From 59274178d29a6b7366883b02e59e31dff30c4907 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 15 Apr 2026 13:26:15 -0400 Subject: [PATCH 2/6] chore: temporarrily trigger units on ci.yaml changes. --- .github/workflows/ci.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fdf4b1fda343..0a9a239f925c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -131,48 +131,56 @@ jobs: filters: | google-auth-library-java: - 'google-auth-library-java/**' + - '.github/workflows/ci.yaml' java-bigquery: - 'java-bigquery/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' java-bigquerystorage: - 'java-bigquerystorage/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' java-datastore: - 'java-datastore/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' java-logging-logback: - 'java-logging-logback/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' java-logging: - 'java-logging/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' java-spanner: - 'java-spanner/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' java-storage: - 'java-storage/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' + - '.github/workflows/ci.yaml' split-units: runs-on: ubuntu-latest needs: changes From 12225708c3f56db66997b8636b39b97b2924fe97 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 15 Apr 2026 13:31:18 -0400 Subject: [PATCH 3/6] Revert "chore: temporarrily trigger units on ci.yaml changes." This reverts commit 59274178d29a6b7366883b02e59e31dff30c4907. --- .github/workflows/ci.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0a9a239f925c..fdf4b1fda343 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -131,56 +131,48 @@ jobs: filters: | google-auth-library-java: - 'google-auth-library-java/**' - - '.github/workflows/ci.yaml' java-bigquery: - 'java-bigquery/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' java-bigquerystorage: - 'java-bigquerystorage/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' java-datastore: - 'java-datastore/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' java-logging-logback: - 'java-logging-logback/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' java-logging: - 'java-logging/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' java-spanner: - 'java-spanner/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' java-storage: - 'java-storage/**' - 'google-auth-library-java/**/*.java' - 'sdk-platform-java/**/*.java' - 'sdk-platform-java/java-shared-dependencies/**/pom.xml' - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml' - - '.github/workflows/ci.yaml' split-units: runs-on: ubuntu-latest needs: changes From e7460a0a34fca8fc7d215d0b5394d9044926bac4 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 15 Apr 2026 13:46:52 -0400 Subject: [PATCH 4/6] deps: update dependencies.properties to latest --- sdk-platform-java/gax-java/dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index fd8588838b5a..17f3ec490bee 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -37,8 +37,8 @@ version.io_grpc=1.76.2 # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.63.2 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.63.2 -maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.42.1 -maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.42.1 +maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.46.0 +maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.46.0 maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.51.0 maven.io_opentelemetry_opentelemetry_context=io.opentelemetry:opentelemetry-context:1.51.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1 From 81f5ac613592ca94fd7ea82f1e8fbf4ebab73e2a Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 15 Apr 2026 13:49:21 -0400 Subject: [PATCH 5/6] chore: temporarily trigger the sdk-platform-java job upon ci.yaml changes --- .github/workflows/sdk-platform-java-ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdk-platform-java-ci.yaml b/.github/workflows/sdk-platform-java-ci.yaml index d2d4e61038cc..3cbd1f2c0741 100644 --- a/.github/workflows/sdk-platform-java-ci.yaml +++ b/.github/workflows/sdk-platform-java-ci.yaml @@ -18,6 +18,7 @@ jobs: library: - 'sdk-platform-java/**' - 'google-auth-library-java/**' + - '.github/workflows/ci.yaml' build: needs: filter if: ${{ needs.filter.outputs.library == 'true' }} From 17b254a753ed4c4ada8b7e4f36a96c8ec233b414 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 15 Apr 2026 13:49:56 -0400 Subject: [PATCH 6/6] Revert "fix: use pre-monorepo setup for split units" This reverts commit f09c2e88f814b4789acde82d38c94a0824776b96. --- .github/workflows/ci.yaml | 16 ++++++---------- release-please | 1 - sdk-platform-java/tracing-sample | 1 - 3 files changed, 6 insertions(+), 12 deletions(-) delete mode 160000 release-please delete mode 160000 sdk-platform-java/tracing-sample diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fdf4b1fda343..c164c3c4fa39 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -209,13 +209,6 @@ jobs: id: date run: echo "::set-output name=week_of_year::$(date +'%W' --utc)" - uses: actions/checkout@v4 - # Java 8 tests use JDK 11 to compile and JDK 8 to run tests. - # Setting up Java 8 first to capture JAVA8_HOME. - - uses: actions/setup-java@v4 - with: - java-version: ${{matrix.java}} - distribution: temurin - - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV - uses: actions/setup-java@v4 with: java-version: 11 @@ -233,7 +226,11 @@ jobs: env: BUILD_SUBDIR: ${{matrix.package}} JOB_TYPE: install - + - uses: actions/setup-java@v4 + with: + java-version: ${{matrix.java}} + distribution: temurin + - run: java -version - name: Run tests in Java ${{matrix.java}} with the source compiled in Java 11 run: | mvn test \ @@ -243,8 +240,7 @@ jobs: -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ -Dmaven.wagon.http.retryHandler.count=5 \ --also-make \ - -T 1C \ - -Djvm="${JAVA8_HOME}/bin/java" + -T 1C env: BUILD_SUBDIR: ${{matrix.package}} JOB_TYPE: test diff --git a/release-please b/release-please deleted file mode 160000 index d464e48c84a0..000000000000 --- a/release-please +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d464e48c84a043c88a483aa0bbdc4490757042a8 diff --git a/sdk-platform-java/tracing-sample b/sdk-platform-java/tracing-sample deleted file mode 160000 index 9712ecf5c5c7..000000000000 --- a/sdk-platform-java/tracing-sample +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9712ecf5c5c76d3d671c3f76db55d6eb3a72db1a