summaryrefslogtreecommitdiff
path: root/scripts/common
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2017-03-03 17:48:24 +0100
committerLukas Rytz <lukas.rytz@gmail.com>2017-03-08 13:39:29 +0100
commit8dc0dd4582314d99d5a4fc427933116339b497ed (patch)
treea7195f977e036f4cb8a98a24015add7800a1a6b3 /scripts/common
parent567aa14cc388c7315dc0d15405d6c583bfe3f3d7 (diff)
downloadscala-8dc0dd4582314d99d5a4fc427933116339b497ed.tar.gz
scala-8dc0dd4582314d99d5a4fc427933116339b497ed.tar.bz2
scala-8dc0dd4582314d99d5a4fc427933116339b497ed.zip
new version numbers for snapshot and integration builds, new repository
Integration builds now have version number like `2.12.2-bin-sha7` or `2.13.0-pre-sha7` and are published to scala-integration (no longer scala-release-temp). scala-release-temp is still used in the bootstrap script for publishing intermediate artifacts (starr, locker). Various cleanups in the scripts.
Diffstat (limited to 'scripts/common')
-rw-r--r--scripts/common9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/common b/scripts/common
index cd9d874cf7..c68a80fd74 100644
--- a/scripts/common
+++ b/scripts/common
@@ -156,15 +156,16 @@ EOF
}
# Generate a repositories file with all allowed repositories in our build environment.
-# Takes one optional argument, the private repository URL.
+# Takes a variable number of additional repositories as argument.
# See http://www.scala-sbt.org/0.13/docs/Proxy-Repositories.html
function generateRepositoriesConfig() {
jcenterCacheUrl=${jcenterCacheUrl-"https://scala-ci.typesafe.com/artifactory/jcenter/"}
sbtRepositoryConfig="$scriptsDir/sbt-repositories-config"
echo > "$sbtRepositoryConfig" '[repositories]'
- if [ -n "$1" ]
- then
- echo >> "$sbtRepositoryConfig" " private-repo: $1"
+ if [[ $# -gt 0 ]]; then
+ for i in $(seq 1 $#); do
+ echo >> "$sbtRepositoryConfig" " script-repo-$i: ${!i}"
+ done
fi
cat >> "$sbtRepositoryConfig" << EOF
jcenter-cache: $jcenterCacheUrl