SLI-1565 Verify caching IDE distribution works

SonarSource · Aug 29, 2024 · 88c1ecd · 88c1ecd
1 parent 4b694a0
commit 88c1ecd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -10,6 +10,10 @@ env:
   SLACK_TOKEN: VAULT[development/kv/data/slack data.token]
   GRADLE_VERSION: "8.9"
   GRADLE_USER_HOME: ${CIRRUS_WORKING_DIR}/.gradle_cache
+  IDEA_HOME: "/opt/intellij"
+  RIDER_HOME: "/opt/rider"
+  RESHARPER_HOME: "/opt/resharper"
+  CLION_HOME: "/opt/clion"
 
 auto_cancellation: $CIRRUS_BRANCH != $CIRRUS_DEFAULT_BRANCH
 
@@ -58,11 +62,6 @@ eks_builder_container: &BUILDER_CONTAINER_DEFINITION
   builder_image: docker-builder-v*
   builder_instance_type: t3.small
   builder_subnet_id: ${CIRRUS_AWS_SUBNET}
-  env:
-    IDEA_HOME: /opt/intellij
-    RIDER_HOME: /opt/rider
-    RESHARPER_HOME: /opt/resharper
-    CLION_HOME: /opt/clion
 
 ec2_instance: &WINVM_DEFINITION
   experimental: true
@@ -148,6 +147,10 @@ validate_windows_task:
   <<: *ONLY_PR_AND_MAINTAINED_BRANCHES
   env:
     JDK_VERSION: "17"
+    IDEA_HOME: ""
+    RIDER_HOME: ""
+    RESHARPER_HOME: ""
+    CLION_HOME: ""
   ec2_instance:
     <<: *WINVM_DEFINITION
   <<: *SETUP_GRADLE_CACHE

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -135,7 +135,7 @@ intellij {
     pluginName.set("sonarlint-intellij")
     updateSinceUntilBuild.set(false)
     plugins.set(listOf("java", "Git4Idea"))
-    if (ideaHome != null) {
+    if (!ideaHome.isNullOrBlank()) {
         localPath.set(ideaHome)
         localSourcesPath.set(ideaHome)
     } else {

diff --git a/clion-common/build.gradle.kts b/clion-common/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 intellij {
-    if (resharperHome != null) {
+    if (!resharperHome.isNullOrBlank()) {
         localPath.set(resharperHome)
         localSourcesPath.set(resharperHome)
     } else {

diff --git a/clion-resharper/build.gradle.kts b/clion-resharper/build.gradle.kts
@@ -2,7 +2,7 @@ val clionResharperBuildVersion: String by project
 val resharperHome: String? = System.getenv("RESHARPER_HOME")
 
 intellij {
-    if (resharperHome != null) {
+    if (!resharperHome.isNullOrBlank()) {
         localPath.set(resharperHome)
         localSourcesPath.set(resharperHome)
     } else {

diff --git a/clion/build.gradle.kts b/clion/build.gradle.kts
@@ -3,7 +3,7 @@ val clionHome: String? = System.getenv("CLION_HOME")
 
 intellij {
     plugins.set(listOf("com.intellij.clion", "com.intellij.cidr.base", "com.intellij.cidr.lang"))
-    if (clionHome != null) {
+    if (!clionHome.isNullOrBlank()) {
         localPath.set(clionHome)
         localSourcesPath.set(clionHome)
     } else {

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 intellij {
-    if (ideaHome != null) {
+    if (!ideaHome.isNullOrBlank()) {
         localPath.set(ideaHome)
         localSourcesPath.set(ideaHome)
     } else {

diff --git a/git/build.gradle.kts b/git/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 intellij {
-    if (ideaHome != null) {
+    if (!ideaHome.isNullOrBlank()) {
         localPath.set(ideaHome)
         localSourcesPath.set(ideaHome)
     } else {

diff --git a/rider/build.gradle.kts b/rider/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 intellij {
-    if (riderHome != null) {
+    if (!riderHome.isNullOrBlank()) {
         localPath.set(riderHome)
         localSourcesPath.set(riderHome)
     } else {