diff options
author | Stefan Zeiger <szeiger@novocode.com> | 2016-07-19 15:14:34 +0200 |
---|---|---|
committer | Stefan Zeiger <szeiger@novocode.com> | 2016-07-21 14:57:15 +0200 |
commit | faa4110fc7d8b92cac1e50a6952cdf3bc85d1cdf (patch) | |
tree | 91cba1a24f8657c214b3d581e8fb928f40bd5047 /scripts/jobs/validate/test | |
parent | 2f75e051a181d4f8618746953ec07226b556fdb3 (diff) | |
download | scala-faa4110fc7d8b92cac1e50a6952cdf3bc85d1cdf.tar.gz scala-faa4110fc7d8b92cac1e50a6952cdf3bc85d1cdf.tar.bz2 scala-faa4110fc7d8b92cac1e50a6952cdf3bc85d1cdf.zip |
Switch Windows CI build to sbt (w/ some sbt build improvements)
- Use sbt in `integrate/windows`: This essentially combines the Unix CI
jobs `validate/publish-core` and `validate/test`, first publishing a
local release built with STARR and then building a new version with
that and running all tests on it.
- Unify repository handling across build scripts: A new function
`generateRepositoriesConfig` in `common`, based on the existing code
in `integrate/bootstrap`, writes the `repositories` file for sbt,
either with or without an extra bootstrap repository for resolving a
previously built version. It is used in all CI scripts to ensure that
artifacts are only resolved through the sanctioned proxies and
upstream repositories.
- The repository URL arguments in `setupPublishCore` and
`setupValidateTest` are now optional as well. These commands are used
without a URL from `integrate/windows`, which publishes to `local`
instead of a temporary remote repository.
- `testAll` is now a task instead of a command. It runs the same
sequence of sub-tasks as before but does not propagate failures
immediately. It always runs all subtasks and reports errors at the
end.
- The `generateBuildCharacterPropertiesFile` task now includes all
properties from `versions.properties` (whose values have potentially
been overwritten with `-D` options) in `buildcharacter.properties`.
Diffstat (limited to 'scripts/jobs/validate/test')
-rwxr-xr-x | scripts/jobs/validate/test | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/jobs/validate/test b/scripts/jobs/validate/test index dd36c5db18..9938319dd8 100755 --- a/scripts/jobs/validate/test +++ b/scripts/jobs/validate/test @@ -4,6 +4,9 @@ baseDir=${WORKSPACE-`pwd`} scriptsDir="$baseDir/scripts" . $scriptsDir/common +generateRepositoriesConfig $prRepoUrl +SBT="$SBT_CMD -Dsbt.override.build.repos=true -Dsbt.repository.config=$sbtRepositoryConfig" + case $prDryRun in yep) @@ -15,12 +18,12 @@ case $prDryRun in # build quick using STARR built upstream, as specified by scalaVersion # (in that sense it's locker, since it was built with starr by that upstream job); # and run JUnit tests, partest, OSGi tests, MiMa and scaladoc - $SBT_CMD \ + $SBT \ -Dstarr.version=$scalaVersion \ --warn \ "setupValidateTest $prRepoUrl" \ $testExtraArgs \ - testAll + testAll | grep -v "was too long to be displayed in the webview, and will be left out" ;; |