Skip to content

Commit

Permalink
SONARGO-73 Update Gradle wrapper and SQ Gradle plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
petertrr committed Dec 13, 2024
1 parent 1236107 commit 9d75393
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
20 changes: 14 additions & 6 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,21 @@ linux_2_cpu_4G_template: &LINUX_2_CPU_4G
cpu: 2
memory: 4G

linux_4_cpu_java_17_container_template: &LINUX_4_CPU_JAVA_17
<<: *LINUX_IMAGE
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
cpu: 4

linux_4_cpu_6G_java_17_template: &LINUX_4_CPU_6G_JAVA_17
eks_container:
<<: *LINUX_IMAGE
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
cpu: 4
<<: *LINUX_4_CPU_JAVA_17
memory: 6G

linux_4_cpu_8G_java_17_template: &LINUX_4_CPU_8G_JAVA_17
eks_container:
<<: *LINUX_4_CPU_JAVA_17
memory: 8G

eks_container: &CONTAINER_DEFINITION
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
cluster_name: ${CIRRUS_CLUSTER_NAME}
Expand All @@ -59,7 +67,7 @@ cleanup_gradle_cache_script_template: &CLEANUP_GRADLE_CACHE_SCRIPT
- rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/build-cache-1/"

build_task:
<<: *LINUX_2_CPU_4G
<<: *LINUX_4_CPU_6G_JAVA_17
<<: *SETUP_GRADLE_CACHE
env:
SONAR_TOKEN: VAULT[development/kv/data/next data.token]
Expand Down Expand Up @@ -110,7 +118,7 @@ qa_plugin_task:
matrix:
- SQ_VERSION: "DEV"
- SQ_VERSION: "LATEST_RELEASE"
<<: *LINUX_4_CPU_6G_JAVA_17
<<: *LINUX_4_CPU_8G_JAVA_17
<<: *GRADLE_ITS_TEMPLATE

qa_ruling_task:

Check warning on line 124 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L124

task "qa_ruling" depends on task "build", but their only_if conditions are different

Check warning on line 124 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L124

task "qa_ruling" depends on task "build", but their only_if conditions are different
Expand All @@ -119,7 +127,7 @@ qa_ruling_task:
SQ_VERSION: "LATEST_RELEASE"
GRADLE_TASK: ":its:ruling:test"
ITS_PROJECT: "ruling"
<<: *LINUX_4_CPU_6G_JAVA_17
<<: *LINUX_4_CPU_8G_JAVA_17
<<: *GRADLE_ITS_TEMPLATE

### Mend tasks
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.util.jar.JarInputStream

plugins {
id 'com.jfrog.artifactory' version '4.28.2'
id 'org.sonarqube' version '3.5.0.2730'
id 'org.sonarqube' version '6.0.1.5171'
id 'de.thetaphi.forbiddenapis' version '3.0' apply false
id 'com.diffplug.spotless' version '6.15.0'
}
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion its/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
testRuntimeOnly testLibs.junit.vintage.engine
}

sonarqube.skipProject = true
sonar.skipProject = true

test {
onlyIf {
Expand Down
2 changes: 1 addition & 1 deletion its/ruling/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
testRuntimeOnly testLibs.junit.vintage.engine
}

sonarqube.skipProject = true
sonar.skipProject = true

test {
onlyIf {
Expand Down

0 comments on commit 9d75393

Please sign in to comment.