SONARGO-82 Split artifactory configuration into artifactory and publi…

…shing
SonarSource · Dec 17, 2024 · caa5172 · caa5172
1 parent e670000
commit caa5172
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -70,15 +70,14 @@ on_failure_template: &ON_FAILURE
 setup_gradle_cache_template: &SETUP_GRADLE_CACHE
   gradle_cache:
     folder: .gradle/caches
+    fingerprint_script: echo "$CIRRUS_BRANCH"
   create_gradle_directory_script:
     - mkdir -p "${CIRRUS_WORKING_DIR}/.gradle"
 
 cleanup_gradle_cache_script_template: &CLEANUP_GRADLE_CACHE_SCRIPT
   cleanup_gradle_script:
-    - /usr/bin/find "${CIRRUS_WORKING_DIR}/.gradle/caches/" -name "*.lock" -type f -delete
-    - rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/4.10.2/"
-    - rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/journal-1/"
-    - rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/build-cache-1/"
+    - rm -rf "${GRADLE_USER_HOME}/caches/journal-1/"
+    - find ${GRADLE_USER_HOME}/caches/ -name "*.lock" -type f -delete || true
 
 build_task:
   <<: *LINUX_4_CPU_6G
@@ -90,9 +89,7 @@ build_task:
   build_script:
     - git submodule update --init --depth 1 -- build-logic
     - source cirrus-env BUILD
-    - function gradle(){ ./gradlew "$@"; }; export -f gradle
-    - gradle --version
-    - source set_gradle_build_version
+    - source .cirrus/use-gradle-wrapper.sh
     - regular_gradle_build_deploy_analyze
   <<: *ON_FAILURE
   <<: *CLEANUP_GRADLE_CACHE_SCRIPT

diff --git a/.gitmodules b/.gitmodules
@@ -13,4 +13,4 @@
 [submodule "build-logic"]
 	path = build-logic
 	url = https://github.com/SonarSource/cloud-native-gradle-modules
-	branch = SONARGO-82
+	branch = SONARGO-82-2
diff --git a/build-logic b/build-logic
diff --git a/sonar-go-plugin/build.gradle.kts b/sonar-go-plugin/build.gradle.kts
@@ -22,7 +22,7 @@ import java.util.jar.JarInputStream
 plugins {
     id("org.sonarsource.cloud-native.java-conventions")
     id("org.sonarsource.cloud-native.code-style-conventions")
-    id("org.sonarsource.cloud-native.artifactory-configuration")
+    id("org.sonarsource.cloud-native.publishing-configuration")
     id("com.github.johnrengelman.shadow") version "7.1.0"
 }
 
@@ -118,7 +118,7 @@ artifacts {
     archives(tasks.shadowJar)
 }
 
-artifactoryConfiguration {
+publishingConfiguration {
     pomName = properties["projectTitle"] as String
     scmUrl = "https://github.com/SonarSource/sonar-go"
 
@@ -127,11 +127,6 @@ artifactoryConfiguration {
         url = "https://sonarsource.com/license/ssal/"
         distribution = "repo"
     }
-
-    buildName = "sonar-go"
-    repoKeyEnv = "ARTIFACTORY_DEPLOY_REPO"
-    usernameEnv = "ARTIFACTORY_DEPLOY_USERNAME"
-    passwordEnv = "ARTIFACTORY_DEPLOY_PASSWORD"
 }
 
 publishing {
+7 −58		gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.artifactory-configuration.gradle.kts
+78 −0		gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.publishing-configuration.gradle.kts
+16 −7		gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/ArtifactoryConfiguration.kt
+1 −3		gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/BuildUtils.kt
+0 −3		gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/CodeStyleConvention.kt
+0 −1		gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/CommonSettingsPlugin.kt