summaryrefslogtreecommitdiff
path: root/project/VersionUtil.scala
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-07-19 15:14:34 +0200
committerStefan Zeiger <szeiger@novocode.com>2016-07-21 14:57:15 +0200
commitfaa4110fc7d8b92cac1e50a6952cdf3bc85d1cdf (patch)
tree91cba1a24f8657c214b3d581e8fb928f40bd5047 /project/VersionUtil.scala
parent2f75e051a181d4f8618746953ec07226b556fdb3 (diff)
downloadscala-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 'project/VersionUtil.scala')
-rw-r--r--project/VersionUtil.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala
index 148fdfbc23..6fe2b004f7 100644
--- a/project/VersionUtil.scala
+++ b/project/VersionUtil.scala
@@ -94,7 +94,7 @@ object VersionUtil {
}
private lazy val generateBuildCharacterPropertiesFileImpl: Def.Initialize[Task[File]] = Def.task {
- writeProps(versionProperties.value.toMap, (baseDirectory in ThisBuild).value / "buildcharacter.properties")
+ writeProps(versionProperties.value.toMap ++ versionProps, (baseDirectory in ThisBuild).value / "buildcharacter.properties")
}
private def writeProps(m: Map[String, String], propFile: File): File = {