diff --git a/.github/workflows/buildBisect.yaml b/.github/workflows/buildBisect.yaml index 1320f869..003f862f 100644 --- a/.github/workflows/buildBisect.yaml +++ b/.github/workflows/buildBisect.yaml @@ -57,8 +57,6 @@ 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 index ebb8a36f..787014ea 100755 --- a/scripts/bisect.scala +++ b/scripts/bisect.scala @@ -224,7 +224,15 @@ object ValidationScript: |scalaVersion=$$(sbt "print ${scala3CompilerProject}/version" | grep . | tail -n 2 | head -n 1) |echo "ScalaVersion=$${scalaVersion}" |rm -r out - |sbt "clean; set every sonatypePublishToBundle := Some(\"CommunityBuildRepo\" at \"$mavenRepo\"); ${scala3Project}/publish" + | + |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" |${validationCommandStatusModifier}${validationScript.getAbsolutePath} "$$scalaVersion" """.stripMargin) }