Skip to content

Commit 26a84d2

Browse files
authored
ES-1657/set sonar to run on default branch (#1610)
1 parent 05fba75 commit 26a84d2

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.ci/JenkinsfileSonarCloud

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ pipeline {
5454

5555
stages {
5656
stage('SonarQube analysis') {
57+
when {
58+
expression { return env.BRANCH_NAME == gitUtils.getDefaultBranch(gitUtils.getRepoName())}
59+
}
5760
steps {
5861
withSonarQubeEnv('SonarCloud') {
5962
sh './gradlew sonar -Si'

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins {
2525
alias libs.plugins.dokka
2626
alias libs.plugins.dependency.check.versions // discover possible dependency version upgrades
2727
alias libs.plugins.cyclonedx.bom apply false
28-
id "org.sonarqube" version "4.4.1.3373"
28+
alias libs.plugins.sonar
2929
}
3030

3131
snyk {

gradle/libs.versions.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ gradleEnterpriseVersion = "3.16.2"
3434
grgitVersion = "5.2.2"
3535
snykVersion = "0.5"
3636
taskTreeVersion = "3.0.0"
37+
sonarVersion = "4.4.1.3373"
3738

3839
[libraries]
3940
slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4jVersion" }
@@ -90,4 +91,5 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinVersion" }
9091
kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlinVersion" }
9192
kotlin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlinVersion" }
9293
snyk = { id = "io.snyk.gradle.plugin.snykplugin", version.ref = "snykVersion" }
93-
task-tree = { id = "com.dorongold.task-tree", version.ref = "taskTreeVersion" }
94+
task-tree = { id = "com.dorongold.task-tree", version.ref = "taskTreeVersion" }
95+
sonar = { id = "org.sonarqube", version.ref = "sonarVersion" }

0 commit comments

Comments
 (0)