From f4b862bed9ebfeef84a090b5523a71f1668c869f Mon Sep 17 00:00:00 2001 From: "Pavan Sai Vasireddy (Vasi)" Date: Wed, 2 Aug 2023 13:27:21 -0700 Subject: [PATCH 1/2] Update spotless dependency to 6.20 --- .github/workflows/codeql-analysis.yml | 7 ++++--- java/settings.gradle.kts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index aa9e25a92..29c782efa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,6 +50,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild + if: matrix.language != 'java' uses: github/codeql-action/autobuild@v2 # ℹ️ Command-line programs to run using the OS shell. @@ -59,9 +60,9 @@ jobs: # and modify them (or add more) to build your code if your project # uses a compiled language - #- run: | - # make bootstrap - # make release + - run: | + ./gradlew build + if: matrix.language == 'java' - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts index b3f4abec0..1fa917e23 100644 --- a/java/settings.gradle.kts +++ b/java/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - id("com.diffplug.spotless") version "6.13.0" + id("com.diffplug.spotless") version "6.20.0" id("com.github.ben-manes.versions") version "0.47.0" id("com.github.johnrengelman.shadow") version "8.1.1" } From 2bc6583a8db6a2f0bcfd3f0c2c520ea6aeae5437 Mon Sep 17 00:00:00 2001 From: "Pavan Sai Vasireddy (Vasi)" Date: Wed, 2 Aug 2023 15:29:44 -0700 Subject: [PATCH 2/2] use working directory --- .github/workflows/codeql-analysis.yml | 1 + .github/workflows/pr-build.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 29c782efa..2e303c5ea 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -63,6 +63,7 @@ jobs: - run: | ./gradlew build if: matrix.language == 'java' + working-directory: ${{ matrix.language }} - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index b171eb735..3dd182f15 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -79,6 +79,7 @@ jobs: if: ${{ matrix.language != 'dotnet' && matrix.language != 'go' }} run: GOARCH=${{ matrix.architecture }} ${{ matrix.build_command }} ${{ matrix.architecture }} working-directory: ${{ matrix.language }} + - name: Build collector if: ${{ matrix.language == 'dotnet' || matrix.language == 'go' }} run: GOARCH=${{ matrix.architecture }} make package