diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/common | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/jobs/integrate/bootstrap | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/scripts/common b/scripts/common index 9563605c75..6c870f720f 100644 --- a/scripts/common +++ b/scripts/common @@ -168,8 +168,8 @@ function generateRepositoriesConfig() { fi cat >> "$sbtRepositoryConfig" << EOF jcenter-cache: $jcenterCacheUrl - typesafe-ivy-releases: https://dl.bintray.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly - sbt-plugin-releases: https://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] + typesafe-ivy-releases: https://repo.lightbend.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + sbt-plugin-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] maven-central local EOF 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 |