Revert "Pass custom JVM home when building compiler (#178)" (#180)

This reverts commit 671d619.
VirtusLab · Jul 6, 2023 · c3df872 · c3df872
1 parent f3dd439
commit c3df872
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/buildBisect.yaml b/.github/workflows/buildBisect.yaml
@@ -57,6 +57,8 @@ jobs:
 
       - uses: coursier/cache-action@v6.4
       - uses: VirtusLab/scala-cli-setup@v1.0.1
+        with:
+          jvm: 8
 
       - name: "Bisect project"
         shell: bash

diff --git a/scripts/bisect.scala b/scripts/bisect.scala
@@ -224,15 +224,7 @@ object ValidationScript:
       |scalaVersion=$$(sbt "print ${scala3CompilerProject}/version" | grep . | tail -n 2 | head -n 1)
       |echo "ScalaVersion=$${scalaVersion}"
       |rm -r out
-      |
-      |JVM_HOME_SBT=""
-      |if [[ -v CI && -z "$${JAVA_HOME_8_X64}" ]]; then 
-      | echo "Java 8 HOME not set"; exit 1;
-      |else
-      | JVM_HOME_SBT="--java-home=$${JAVA_HOME_8_X64}"
-      |fi
-      |
-      |sbt $${JVM_HOME_SBT} "clean; set every sonatypePublishToBundle := Some(\"CommunityBuildRepo\" at \"$mavenRepo\"); ${scala3Project}/publish"
+      |sbt "clean; set every sonatypePublishToBundle := Some(\"CommunityBuildRepo\" at \"$mavenRepo\"); ${scala3Project}/publish"
       |${validationCommandStatusModifier}${validationScript.getAbsolutePath} "$$scalaVersion"
       """.stripMargin)
   }