[High Priority] Excavator: Update gradle-jdks infrastructure plugins (#…

…482)
palantir · Nov 4, 2024 · f0d65c5 · f0d65c5
1 parent b783d12
commit f0d65c5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.53.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.54.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
     }
 }

diff --git a/gradle/gradle-jdks-functions.sh b/gradle/gradle-jdks-functions.sh
@@ -123,44 +123,49 @@ install_and_setup_jdks() {
     # Check if distribution exists in $GRADLE_JDKS_HOME
     jdk_installation_directory="$GRADLE_JDKS_HOME"/"$distribution_local_path"
     if [ ! -d "$jdk_installation_directory" ]; then
-      # Download and extract the distribution into a temporary directory
       echo "JDK installation '$jdk_installation_directory' does not exist, installing '$distribution_url' in progress ..."
-      in_progress_dir="$TMP_WORK_DIR/$distribution_local_path.in-progress"
-      mkdir -p "$in_progress_dir"
-      cd "$in_progress_dir" || die "failed to change dir to $in_progress_dir"
-      if command -v curl > /dev/null 2>&1; then
-        echo "Using curl to download $distribution_url"
-        case "$distribution_url" in
-          *.zip)
-            distribution_name=${distribution_url##*/}
-            curl -C - "$distribution_url" -o "$distribution_name"
-            tar -xzf "$distribution_name"
-            ;;
-          *)
-            curl -C - "$distribution_url" | tar -xzf -
-            ;;
-        esac
-      elif command -v wget > /dev/null 2>&1; then
-        echo "Using wget to download $distribution_url"
-        case "$distribution_url" in
-          *.zip)
-            distribution_name=${distribution_url##*/}
-            wget -c "$distribution_url" -O "$distribution_name"
-            tar -xzf "$distribution_name"
-            ;;
-          *)
-            wget -qO- -c "$distribution_url" | tar -xzf -
-            ;;
-        esac
-      else
-        die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME"
-      fi
-      cd - || exit
-
-      # Finding the java_home
-      java_home=$(get_java_home "$in_progress_dir")
-      "$java_home"/bin/java -cp "$scripts_dir"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup jdkSetup "$jdk_installation_directory" || die "Failed to set up JDK $jdk_installation_directory"
-      echo "Successfully installed JDK distribution in $jdk_installation_directory"
+    elif [ ! -f "$jdk_installation_directory/bin/java" ]; then
+      echo "Java executable not found in $jdk_installation_directory/bin/java, re-installing the JDK...."
+    else
+      echo "JDK installation $jdk_installation_directory was already configured"
+      continue
+    fi
+    # Download and extract the distribution into a temporary directory
+    in_progress_dir="$TMP_WORK_DIR/$distribution_local_path.in-progress"
+    mkdir -p "$in_progress_dir"
+    cd "$in_progress_dir" || die "failed to change dir to $in_progress_dir"
+    if command -v curl > /dev/null 2>&1; then
+      echo "Using curl to download $distribution_url"
+      case "$distribution_url" in
+        *.zip)
+          distribution_name=${distribution_url##*/}
+          curl -C - "$distribution_url" -o "$distribution_name"
+          tar -xzf "$distribution_name"
+          ;;
+        *)
+          curl -k -C - "$distribution_url" | tar -xzf -
+          ;;
+      esac
+    elif command -v wget > /dev/null 2>&1; then
+      echo "Using wget to download $distribution_url"
+      case "$distribution_url" in
+        *.zip)
+          distribution_name=${distribution_url##*/}
+          wget -c "$distribution_url" -O "$distribution_name"
+          tar -xzf "$distribution_name"
+          ;;
+        *)
+          wget -qO- -c "$distribution_url" | tar -xzf -
+          ;;
+      esac
+    else
+      die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME"
     fi
+    cd - || exit
+
+    # Finding the java_home
+    java_home=$(get_java_home "$in_progress_dir")
+    "$java_home"/bin/java -cp "$scripts_dir"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup jdkSetup "$jdk_installation_directory" || die "Failed to set up JDK $jdk_installation_directory"
+    echo "Successfully installed JDK distribution in $jdk_installation_directory"
   done
 }
diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar
diff --git a/settings.gradle b/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
     dependencies {
-        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.53.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.54.0'
     }
 }
 apply plugin: 'com.palantir.jdks.settings'