Fix for sonar scans

Signed-off-by: Uladzislau <[email protected]>
zowe · Sep 28, 2024 · 1d1aa10 · 1d1aa10
1 parent 9692898
commit 1d1aa10
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.github/actions/sonar/action.yml b/.github/actions/sonar/action.yml
@@ -18,6 +18,8 @@ runs:
         ./gradlew --info sonar
         -Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=512m"
         -Dresults="build/reports/tests/test,build/test-results/test,build/reports/kover/html"
-        -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN
+        -Psonar.host.url=$SONAR_HOST_URL
+        -Dsonar.token=$SONAR_TOKEN
+        -Dsonar.organization=Zowe
         -Dsonar.coverage.jacoco.xmlReportPaths="build/reports/kover/xml/report.xml"
         -Dsonar.coverage.exclusions="**src/IC-*/**"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
           echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
 
           # prepare list of IDEs to use by plugin verifier:
-          ./gradlew listProductsReleases
+          ./gradlew --quiet printProductsReleases > build/productReleases.txt
 
       - name: Build plugin
         shell: bash
@@ -149,7 +149,7 @@ jobs:
           path: ${{ github.workspace }}/build/reports/kover/html
 
       - name: SonarCloud scans
-        if: ${{ matrix.product == 'IC-233' }}
+        if: ${{ matrix.product == 'IC-243' }}
         continue-on-error: true
         uses: ./.github/actions/sonar
         env:
@@ -203,12 +203,12 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
-          key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
+          key: plugin-verifier-${{ hashFiles('build/productReleases.txt') }}
 
       - name: Verify plugin against IntelliJ IDEA IDE's
         continue-on-error: true
         shell: bash
-        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
+        run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
         env:
           PRODUCT_NAME: ${{ matrix.product }}
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,7 +73,7 @@ val zoweKotlinSdkVersion = "0.5.0"
 val javaKeytarVersion = "1.0.0"
 
 plugins {
-  id("org.sonarqube") version "5.0.0.4638"
+  id("org.sonarqube") version "5.1.0.4882"
   id("org.jetbrains.intellij.platform") version "2.1.0"
   id("org.jetbrains.changelog") version "2.2.1"
   kotlin("jvm") version "1.9.22"
@@ -117,6 +117,7 @@ dependencies {
     intellijIdeaCommunity(descriptor.sdkVersion, useInstaller = false)
     jetbrainsRuntime()
     instrumentationTools()
+    pluginVerifier()
     testFramework(TestFrameworkType.Plugin.Java)
   }
   implementation(group = "com.squareup.retrofit2", name = "retrofit", version = retrofit2Vertion)
@@ -146,6 +147,14 @@ intellijPlatform {
   pluginConfiguration {
     version = "${properties("pluginVersion").get()}-${descriptor.since.substringBefore(".")}"
   }
+  pluginVerification {
+    ides {
+      select {
+        sinceBuild = descriptor.since
+        untilBuild = descriptor.until
+      }
+    }
+  }
 }
 
 // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin