diff --git a/.drone.yml b/.drone.yml index 14a67a41edc3..d9d9d223b88a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,8 +40,7 @@ pipeline: commands: - cp -R . /tmp/3/ && cd /tmp/3/ - git submodule update --init --recursive --jobs 7 - - export PATH=/tmp/4/project/scripts:$PATH - - sbt community-build/test + - ./project/scripts/sbt community-build/test test_sbt: group: test diff --git a/community-build/community-projects/fastparse b/community-build/community-projects/fastparse index 3cd994617054..79431b056713 160000 --- a/community-build/community-projects/fastparse +++ b/community-build/community-projects/fastparse @@ -1 +1 @@ -Subproject commit 3cd9946170543fef8bd89d4d2445805c90f0232f +Subproject commit 79431b0567131084e82ed1f5769c3063e2917bf6 diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode index 54291ae38493..f8a839871c02 160000 --- a/community-build/community-projects/sourcecode +++ b/community-build/community-projects/sourcecode @@ -1 +1 @@ -Subproject commit 54291ae384937a6d140b17502848a0bf96873d61 +Subproject commit f8a839871c02a7ef45afc4bfa6ed2688e7e67aa1 diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index eef7623d2dfa..badcb38d0ab7 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -58,11 +58,19 @@ class CommunityBuildTest { val pluginFilePath = communitybuildDir.resolve("sbt-dotty-sbt").toAbsolutePath().toString() // Run the sbt command with the compiler version and sbt plugin set in the build - val arguments = extraSbtArgs ++ Seq( - "-sbt-version", "1.2.7", - s"--addPluginSbtFile=$pluginFilePath", - s";clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! $testCommand" - ) + val arguments = { + val sbtProps = Option(System.getProperty("sbt.ivy.home")) match { + case Some(ivyHome) => + Seq(s"-Dsbt.ivy.home=$ivyHome") + case _ => + Seq() + } + extraSbtArgs ++ sbtProps ++ Seq( + "-sbt-version", "1.2.7", + s"--addPluginSbtFile=$pluginFilePath", + s";clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! $testCommand" + ) + } val exitCode = exec("sbt", arguments: _*)