File tree Expand file tree Collapse file tree 2 files changed +14
-6
lines changed Expand file tree Collapse file tree 2 files changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ pipeline:
41
41
- cp -R . /tmp/3/ && cd /tmp/3/
42
42
- git submodule update --init --recursive --jobs 7
43
43
- export PATH=/tmp/4/project/scripts:$PATH
44
- - sbt community-build/test
44
+ - ./project/scripts/ sbt community-build/test
45
45
46
46
test_sbt :
47
47
group : test
Original file line number Diff line number Diff line change @@ -58,11 +58,19 @@ class CommunityBuildTest {
58
58
val pluginFilePath = communitybuildDir.resolve(" sbt-dotty-sbt" ).toAbsolutePath().toString()
59
59
60
60
// Run the sbt command with the compiler version and sbt plugin set in the build
61
- val arguments = extraSbtArgs ++ Seq (
62
- " -sbt-version" , " 1.2.7" ,
63
- s " --addPluginSbtFile= $pluginFilePath" ,
64
- s " ;clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++ $compilerVersion! $testCommand"
65
- )
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 (
69
+ " -sbt-version" , " 1.2.7" ,
70
+ s " --addPluginSbtFile= $pluginFilePath" ,
71
+ s " ;clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++ $compilerVersion! $testCommand"
72
+ )
73
+ }
66
74
67
75
val exitCode = exec(" sbt" , arguments : _* )
68
76
You can’t perform that action at this time.
0 commit comments