diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-10-14 15:52:40 +1100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-10-14 15:52:40 +1100 |
| commit | 9fb438c361f8f81c162917462cbc9941189f13b8 (patch) | |
| tree | c47737268db039e044b58e34296180f5d47acd95 /scripts | |
| parent | 9d3f0777ff883a7c59da3fa7fee156890f51701e (diff) | |
| parent | 6114b7c7f96a68bf950999551a8b6d40c7ea37cc (diff) | |
| download | scala-9fb438c361f8f81c162917462cbc9941189f13b8.tar.gz scala-9fb438c361f8f81c162917462cbc9941189f13b8.tar.bz2 scala-9fb438c361f8f81c162917462cbc9941189f13b8.zip | |
Merge remote-tracking branch 'origin/2.12.0' into merge/2.12.0-to-2.12.x
Diffstat (limited to 'scripts')
| -rwxr-xr-x[-rw-r--r--] | scripts/jobs/integrate/bootstrap | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index bd509061b7..5340bda0e1 100644..100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -90,7 +90,9 @@ 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 +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 |