Skip to content

Commit 6ef431b

Browse files
committed
Fix PATH setting.
1 parent 7f2f041 commit 6ef431b

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ pipeline:
4040
commands:
4141
- cp -R . /tmp/3/ && cd /tmp/3/
4242
- git submodule update --init --recursive --jobs 7
43-
- export PATH=/tmp/4/project/scripts:$PATH
44-
- ./project/scripts/sbt community-build/test
43+
- export PATH=$PWD/project/scripts:$PATH
44+
- sbt community-build/test
4545

4646
test_sbt:
4747
group: test

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,12 @@ class CommunityBuildTest {
5858
val pluginFilePath = communitybuildDir.resolve("sbt-dotty-sbt").toAbsolutePath().toString()
5959

6060
// Run the sbt command with the compiler version and sbt plugin set in the build
61-
val arguments = {
62-
val sbtProps = Option(System.getProperty("sbt.ivy.home")) match {
63-
case Some(ivyHome) =>
64-
Seq(s"-Dsbt.ivy.home=$ivyHome")
65-
case _ =>
66-
Seq()
67-
}
68-
extraSbtArgs ++ sbtProps ++ Seq(
61+
val arguments =
62+
extraSbtArgs ++ Seq(
6963
"-sbt-version", "1.2.7",
7064
s"--addPluginSbtFile=$pluginFilePath",
7165
s";clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! $testCommand"
7266
)
73-
}
7467

7568
val exitCode = exec("sbt", arguments: _*)
7669

0 commit comments

Comments
 (0)