diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index bbe558e168b4..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') @@ -46,13 +47,17 @@ 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 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: 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 +84,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 +99,4 @@ jobs: -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.projectName=java_showcase_integration_tests + working-directory: sdk-platform-java 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'