From 2164eb7f95e33f51533e91c04546d75dcfd51443 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 13 Oct 2016 11:17:05 -0700 Subject: Make sbtBuildTask configurable in bootstrap --- scripts/jobs/integrate/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 scripts/jobs/integrate/bootstrap (limited to 'scripts') diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap old mode 100644 new mode 100755 index bd509061b7..30bcf01b6a --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -90,7 +90,7 @@ publishSonatypeTaskModules=${publishSonatypeTaskModules-"publishSigned"} forceRebuild=${forceRebuild-no} -sbtBuildTask="testAll" # TESTING leave empty to avoid the sanity check +sbtBuildTask=${sbtBuildTask-"testAll"} # TESTING leave empty to avoid the sanity check clean="clean" # TESTING leave empty to speed up testing baseDir=${WORKSPACE-`pwd`} -- cgit v1.2.3 From 6114b7c7f96a68bf950999551a8b6d40c7ea37cc Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 13 Oct 2016 15:03:49 -0700 Subject: Make stability test optional. To allow building a dist for the community build in under 20 mins. --- scripts/jobs/integrate/bootstrap | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 30bcf01b6a..5340bda0e1 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -91,6 +91,8 @@ publishSonatypeTaskModules=${publishSonatypeTaskModules-"publishSigned"} forceRebuild=${forceRebuild-no} sbtBuildTask=${sbtBuildTask-"testAll"} # TESTING leave empty to avoid the sanity check +testStability=${testStability-yes} + clean="clean" # TESTING leave empty to speed up testing baseDir=${WORKSPACE-`pwd`} @@ -529,6 +531,15 @@ bootstrap() { # clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala rm -rf $baseDir/ivy2 + # TODO: create PR with following commit (note that release will have been tagged already) + # git commit versions.properties -m"Bump versions.properties for $SCALA_VER." +} + +testStability() { + echo "### Testing stability" + + cd $baseDir + # Run stability tests using the just built version as "quick" and a new version as "strap" mv build/quick quick1 rm -rf build/ @@ -542,9 +553,6 @@ bootstrap() { mv build/quick build/strap mv quick1 build/quick $scriptsDir/stability-test.sh - - # TODO: create PR with following commit (note that release will have been tagged already) - # git commit versions.properties -m"Bump versions.properties for $SCALA_VER." } # assumes we just bootstrapped, and current directory is $baseDir @@ -591,6 +599,10 @@ removeExistingBuilds bootstrap +if [ "$testStability" == "yes" ] + then testStability +fi + if [ "$publishToSonatype" == "yes" ] then publishSonatype fi -- cgit v1.2.3