From 09d94259aaf2e8e339603ec17155766f79b67e1a Mon Sep 17 00:00:00 2001 From: chingor13 Date: Tue, 31 Mar 2026 19:21:35 +0000 Subject: [PATCH 1/6] ci: fix paths for sonar checks --- .github/workflows/sdk-platform-java-sonar.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index bbe558e168b4..7be95a1c3a55 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -49,10 +49,10 @@ jobs: - name: Install modules to local maven run: | mvn install -T 1C -DskipTests -ntp -B - cd java-showcase + cd sdk-platform-java/java-showcase mvn install -T 1C -DskipTests -ntp -B - name: Parse showcase version - working-directory: java-showcase/gapic-showcase + working-directory: sdk-platform-java/java-showcase/gapic-showcase run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV" - name: Install showcase server run: | @@ -79,6 +79,7 @@ jobs: -Dsonar.projectKey=googleapis_gapic-generator-java \ -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io + working-directory: sdk-platform-java - name: Build and analyze Showcase Integration Tests Coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any @@ -93,3 +94,4 @@ jobs: -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.projectName=java_showcase_integration_tests + working-directory: sdk-platform-java From ee76961f3e0b4493f47dc1b0c40238053522c1c3 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Tue, 31 Mar 2026 19:21:52 +0000 Subject: [PATCH 2/6] trivial change to trigger ci --- sdk-platform-java/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk-platform-java/pom.xml b/sdk-platform-java/pom.xml index f6ac656163c0..dcd39349f6f8 100644 --- a/sdk-platform-java/pom.xml +++ b/sdk-platform-java/pom.xml @@ -26,6 +26,7 @@ java-shared-dependencies sdk-platform-java-config + From f983b4acff06a3b4d0c46296702c4ce409a73e51 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Tue, 31 Mar 2026 21:06:47 +0000 Subject: [PATCH 3/6] only install necessary --- .github/workflows/sdk-platform-java-sonar.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index 7be95a1c3a55..b9e5752beefc 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -46,11 +46,15 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Install modules to local maven - run: | - mvn install -T 1C -DskipTests -ntp -B - cd sdk-platform-java/java-showcase - mvn install -T 1C -DskipTests -ntp -B + - name: Install all modules first + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install + - name: Install showcase to local maven + run: mvn install -T 1C -DskipTests -ntp -B + working-directory: sdk-platform-java/java-showcase - name: Parse showcase version working-directory: sdk-platform-java/java-showcase/gapic-showcase run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV" From 5c3d20a6136aacee8ed6f5739ff267c639b75644 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Tue, 31 Mar 2026 21:08:19 +0000 Subject: [PATCH 4/6] run if workflow modified --- .github/workflows/sdk-platform-java-sonar.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index b9e5752beefc..12abcd3c452c 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -20,6 +20,7 @@ jobs: filters: | library: - 'sdk-platform-java/**' + - '.github/workflows/sdk-platform-java-sonar.yaml' build: needs: filter if: needs.filter.outputs.library == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') From ef812614aa75a82071f6ddb12bb45fb6cb6c3cd6 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Tue, 31 Mar 2026 21:08:28 +0000 Subject: [PATCH 5/6] Revert "trivial change to trigger ci" This reverts commit ee76961f3e0b4493f47dc1b0c40238053522c1c3. --- sdk-platform-java/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk-platform-java/pom.xml b/sdk-platform-java/pom.xml index dcd39349f6f8..f6ac656163c0 100644 --- a/sdk-platform-java/pom.xml +++ b/sdk-platform-java/pom.xml @@ -26,7 +26,6 @@ java-shared-dependencies sdk-platform-java-config - From 25320166fa7aff8236dcbc20fc6965c5c859f78b Mon Sep 17 00:00:00 2001 From: chingor13 Date: Tue, 31 Mar 2026 21:19:41 +0000 Subject: [PATCH 6/6] google-iam libraries need to be installed for core deps --- .kokoro/common.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.kokoro/common.sh b/.kokoro/common.sh index 9fe966173726..e20f7e9fbe80 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -422,6 +422,16 @@ function install_modules() { 'sdk-platform-java/java-shared-dependencies/first-party-dependencies' 'sdk-platform-java/java-shared-dependencies/third-party-dependencies' 'sdk-platform-java/gapic-generator-java-bom' + 'sdk-platform-java/java-iam/grpc-google-iam-v1' + 'sdk-platform-java/java-iam/grpc-google-iam-v2' + 'sdk-platform-java/java-iam/grpc-google-iam-v2beta' + 'sdk-platform-java/java-iam/grpc-google-iam-v3' + 'sdk-platform-java/java-iam/grpc-google-iam-v3beta' + 'sdk-platform-java/java-iam/proto-google-iam-v1' + 'sdk-platform-java/java-iam/proto-google-iam-v2' + 'sdk-platform-java/java-iam/proto-google-iam-v2beta' + 'sdk-platform-java/java-iam/proto-google-iam-v3' + 'sdk-platform-java/java-iam/proto-google-iam-v3beta' 'sdk-platform-java/java-core/google-cloud-core-bom' 'sdk-platform-java/java-core/google-cloud-core' 'sdk-platform-java/java-core/google-cloud-core-grpc'