diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-03 22:06:42 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 09:19:19 +1000 |
| commit | da46355a90442636ee7634c31a69eae8e8b9cd42 (patch) | |
| tree | eec9abbf057e3c5fd4566df6628f9693835cc536 /scripts/common | |
| parent | 74e53cb4930fc3e02222d8be0f065ce8aaa71230 (diff) | |
| parent | cc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff) | |
| download | scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.gz scala-da46355a90442636ee7634c31a69eae8e8b9cd42.tar.bz2 scala-da46355a90442636ee7634c31a69eae8e8b9cd42.zip | |
Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203
Conflicts:
build.sbt
scripts/jobs/integrate/bootstrap
Diffstat (limited to 'scripts/common')
| -rw-r--r-- | scripts/common | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/common b/scripts/common index b075469379..35199992bc 100644 --- a/scripts/common +++ b/scripts/common @@ -18,6 +18,9 @@ IVY_CACHE="$WORKSPACE/.ivy2" mkdir -p $IVY_CACHE rm -rf $IVY_CACHE/cache/org.scala-lang +SBT_CMD=${sbtCmd-sbt} +SBT_CMD="$SBT_CMD -sbt-version 0.13.9" + # temp dir where all 'non-build' operation are performed TMP_ROOT_DIR=$(mktemp -d -t pr-scala.XXXX) TMP_DIR="${TMP_ROOT_DIR}/tmp" |