Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SONARGO-73 Update Gradle wrapper and SQ Gradle plugin #36

Merged
merged 3 commits into from
Dec 13, 2024
+21 −12
Merged

SONARGO-73 Update Gradle wrapper and SQ Gradle plugin #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
678c2d2
SONARGO-73 Update Gradle wrapper and SQ Gradle plugin
petertrr Dec 11, 2024
3a3c9cf
Review notes
petertrr Dec 13, 2024
6d2672d
Update included build
petertrr Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,21 @@
cpu: 2
memory: 4G

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

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

linux_4_cpu_8G_template: &LINUX_4_CPU_8G
eks_container:
<<: *LINUX_4_CPU
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 Down Expand Up @@ -73,7 +81,7 @@
- rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/build-cache-1/"

build_task:
<<: *LINUX_2_CPU_4G
<<: *LINUX_4_CPU_6G
<<: *SETUP_GRADLE_CACHE
env:
SONAR_TOKEN: VAULT[development/kv/data/next data.token]
Expand Down Expand Up @@ -112,7 +120,7 @@
-Pqa --info --stacktrace --console plain --no-daemon --build-cache
<<: *CLEANUP_GRADLE_CACHE_SCRIPT

qa_plugin_task:

Check warning on line 123 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L123 

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

Check warning on line 123 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L123 

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

Check warning on line 123 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L123 

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

Check warning on line 123 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L123 

task "qa_plugin" depends on task "build", but their only_if conditions are different
<<: *QA_TASK_FILTER
env:
ITS_PROJECT: "plugin"
Expand All @@ -120,18 +128,18 @@
matrix:
- SQ_VERSION: "DEV"
- SQ_VERSION: "LATEST_RELEASE"
<<: *LINUX_4_CPU_6G_JAVA_17
<<: *LINUX_4_CPU_8G
<<: *GRADLE_ITS_TEMPLATE
<<: *ON_FAILURE


qa_ruling_task:

Check warning on line 136 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L136 

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

Check warning on line 136 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L136 

task "qa_ruling" depends on task "build", but their only_if conditions are different
<<: *QA_TASK_FILTER
env:
SQ_VERSION: "LATEST_RELEASE"
GRADLE_TASK: ":its:ruling:test"
ITS_PROJECT: "ruling"
<<: *LINUX_4_CPU_6G_JAVA_17
<<: *LINUX_4_CPU_8G
<<: *GRADLE_ITS_TEMPLATE
<<: *ON_FAILURE

Expand Down Expand Up @@ -165,7 +173,7 @@

### Promote tasks

promote_task:

Check warning on line 176 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L176 

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

Check warning on line 176 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L176 

task "promote" depends on task "build", but their only_if conditions are different
depends_on:
- build
- qa_plugin
Expand Down
2 changes: 1 addition & 1 deletion build-logic
Open in desktop
Submodule build-logic updated 8 files
+1 −2 .github/CODEOWNERS
+184 −165 LICENSE
+16 −0 LICENSE_HEADER
+14 −8 gradle-modules/build.gradle.kts
+5 −8 gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.java-conventions.gradle.kts
+1 −0 gradle.properties
+8 −0 gradle/libs.versions.toml
+24 −8 settings.gradle.kts
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading