From 2e45dd53cc2cf176ce842b63e98a0914daacf038 Mon Sep 17 00:00:00 2001 From: jjacobs44 <89410776+jjacobs44@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:44:09 -0700 Subject: [PATCH 01/11] Create code_quality.yml --- .github/workflows/code_quality.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/code_quality.yml diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml new file mode 100644 index 000000000..360dc5b5c --- /dev/null +++ b/.github/workflows/code_quality.yml @@ -0,0 +1,23 @@ +name: Qodana +on: + workflow_dispatch: + pull_request: + types: [ready_for_review] +jobs: + qodana: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + checks: write + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis + args: --apply-fixes + push-fixes: pull-request + - name: 'Qodana Scan' + uses: JetBrains/qodana-action@v2024.2 + env: + QODANA_LICENSE: ${{ secrets.QODANA_LICENSE }} # read the steps about it below From 2a7cc22a4ed1da268d2ecce19410bd21aed31505 Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 16:23:57 -0700 Subject: [PATCH 02/11] Temp workaround to get the workflow to run --- .github/workflows/code_quality.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 360dc5b5c..76e189941 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -2,7 +2,6 @@ name: Qodana on: workflow_dispatch: pull_request: - types: [ready_for_review] jobs: qodana: runs-on: ubuntu-latest From a470925cd6d0359372e5a9b4443906a36b07645a Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 16:28:02 -0700 Subject: [PATCH 03/11] move config to proper spot --- .github/workflows/code_quality.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 76e189941..bb8fe6955 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -14,9 +14,10 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit fetch-depth: 0 # a full history is required for pull request analysis - args: --apply-fixes - push-fixes: pull-request - name: 'Qodana Scan' uses: JetBrains/qodana-action@v2024.2 + with: + args: --apply-fixes + push-fixes: pull-request env: QODANA_LICENSE: ${{ secrets.QODANA_LICENSE }} # read the steps about it below From 6122d3677ab4841bd5d073bfa6f27256527c45e5 Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 17:00:23 -0700 Subject: [PATCH 04/11] empty qodana config --- qodana.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 qodana.yaml diff --git a/qodana.yaml b/qodana.yaml new file mode 100644 index 000000000..5654a0486 --- /dev/null +++ b/qodana.yaml @@ -0,0 +1,2 @@ +version: "1.0" +linter: jetbrains/qodana-jvm:2024.1 From 6e973512833de08e189019647f34d91db49bdd92 Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 21:17:33 -0700 Subject: [PATCH 05/11] bump linter version --- qodana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qodana.yaml b/qodana.yaml index 5654a0486..f46d9ca74 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,2 +1,2 @@ version: "1.0" -linter: jetbrains/qodana-jvm:2024.1 +linter: jetbrains/qodana-jvm:2024.2 From 21fbae556c755596af28fbe378baf35763f5d8ff Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 21:27:41 -0700 Subject: [PATCH 06/11] specify projectJDK --- qodana.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/qodana.yaml b/qodana.yaml index f46d9ca74..bd97ed7f5 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,2 +1,3 @@ version: "1.0" linter: jetbrains/qodana-jvm:2024.2 +projectJDK: 17 \ No newline at end of file From 953b7f623af39386a865925432ff30fe4e41e3de Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 21:33:19 -0700 Subject: [PATCH 07/11] Test auto provisioning jdk --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index 592cc0d68..d7305b02a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,7 @@ systemProp.nebula.features.coreBomSupport=true kotlin.code.style=official org.gradle.caching = true +org.gradle.java.installations.auto-detect=true # org.gradle.parallel = true # org.gradle.configureondemand = true org.gradle.jvmargs=-Xmx2000m From 8d5f9b10aca0f2dfcd003dc0b65ce1ea550fa7db Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 21:52:58 -0700 Subject: [PATCH 08/11] test --- .github/workflows/code_quality.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index bb8fe6955..bd7592d77 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -14,10 +14,12 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit fetch-depth: 0 # a full history is required for pull request analysis + - id: get-java-home-17 + run: echo "JAVA_HOME_17_X64=$JAVA_HOME_17_X64" >> $GITHUB_OUTPUT - name: 'Qodana Scan' uses: JetBrains/qodana-action@v2024.2 with: - args: --apply-fixes + args: -v,${{ steps.get-java-home-17.outputs.JAVA_HOME_17_X64 }}:/root/.jdks/jdk17 push-fixes: pull-request env: QODANA_LICENSE: ${{ secrets.QODANA_LICENSE }} # read the steps about it below From 7e73c1cc58093ddae1dc9e0c947304363470bafb Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 22:12:36 -0700 Subject: [PATCH 09/11] test sarif_file --- .github/workflows/code_quality.yml | 3 +++ gradle.properties | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index bd7592d77..c60eab6c0 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -23,3 +23,6 @@ jobs: push-fixes: pull-request env: QODANA_LICENSE: ${{ secrets.QODANA_LICENSE }} # read the steps about it below + - uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d7305b02a..592cc0d68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,6 @@ systemProp.nebula.features.coreBomSupport=true kotlin.code.style=official org.gradle.caching = true -org.gradle.java.installations.auto-detect=true # org.gradle.parallel = true # org.gradle.configureondemand = true org.gradle.jvmargs=-Xmx2000m From 2c87106fef549ed1af369df84d06e782e701a4e6 Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 23:02:46 -0700 Subject: [PATCH 10/11] test --- .github/workflows/code_quality.yml | 6 ++---- qodana.yaml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index c60eab6c0..9f83fe1a9 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -21,8 +21,6 @@ jobs: with: args: -v,${{ steps.get-java-home-17.outputs.JAVA_HOME_17_X64 }}:/root/.jdks/jdk17 push-fixes: pull-request + upload-result: true env: - QODANA_LICENSE: ${{ secrets.QODANA_LICENSE }} # read the steps about it below - - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json \ No newline at end of file + QODANA_LICENSE: ${{ secrets.QODANA_LICENSE }} # read the steps about it below \ No newline at end of file diff --git a/qodana.yaml b/qodana.yaml index bd97ed7f5..d005e8b6d 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,3 +1,2 @@ version: "1.0" -linter: jetbrains/qodana-jvm:2024.2 -projectJDK: 17 \ No newline at end of file +linter: jetbrains/qodana-jvm:2024.2 \ No newline at end of file From 3f279342cf9181dade486476ff25adee1ea987c1 Mon Sep 17 00:00:00 2001 From: Jessie Jacobs Date: Tue, 29 Oct 2024 23:16:24 -0700 Subject: [PATCH 11/11] test passing scripts to the container --- .github/workflows/code_quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 9f83fe1a9..7f1eb3263 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -19,7 +19,7 @@ jobs: - name: 'Qodana Scan' uses: JetBrains/qodana-action@v2024.2 with: - args: -v,${{ steps.get-java-home-17.outputs.JAVA_HOME_17_X64 }}:/root/.jdks/jdk17 + args: -v,${{ steps.get-java-home-17.outputs.JAVA_HOME_17_X64 }}:/root/.jdks/jdk17, --script, "/opt/idea/bin/idea.sh installPlugins com.netflix.spring.intellij.spring-boot-netflix-intellij-plugin https://artifacts.netflix.net/devtools/sbn-intellij/updatePlugins.xml" push-fixes: pull-request upload-result: true env: