From e0c2c423e8a399fd00090bf23e37d335a1a46029 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Wed, 20 May 2015 02:05:25 +0200
Subject: Run builds in parallel on the same machine.

Allows sbts not to lock on the same ivy cache.
---
 scripts/common                   | 1 +
 scripts/jobs/validate/junit      | 2 +-
 scripts/jobs/validate/partest    | 2 +-
 scripts/jobs/validate/scalastyle | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/common b/scripts/common
index c9453506d..1c7be04f2 100755
--- a/scripts/common
+++ b/scripts/common
@@ -11,3 +11,4 @@ update() {
   git reset --hard
 }
 
+sbtArgs="-Ddotty.travis.build=yes -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13"
diff --git a/scripts/jobs/validate/junit b/scripts/jobs/validate/junit
index 9b8443020..f6c4369a5 100755
--- a/scripts/jobs/validate/junit
+++ b/scripts/jobs/validate/junit
@@ -3,4 +3,4 @@ scriptsDir="$baseDir/scripts"
 . $scriptsDir/common
 
 update scala scala
-sbt -Ddotty.travis.build=yes update compile test
+sbt $sbtArgs update compile test
diff --git a/scripts/jobs/validate/partest b/scripts/jobs/validate/partest
index 7ff8764a7..4fd67f1b8 100755
--- a/scripts/jobs/validate/partest
+++ b/scripts/jobs/validate/partest
@@ -2,5 +2,5 @@ baseDir=${WORKSPACE-`pwd`}
 scriptsDir="$baseDir/scripts"
 . $scriptsDir/common
 
-sbt -Ddotty.travis.build=yes update compile "partest run"
+sbt $sbtArgs update compile "partest run"
 
diff --git a/scripts/jobs/validate/scalastyle b/scripts/jobs/validate/scalastyle
index 14c1c206a..dff202e8b 100755
--- a/scripts/jobs/validate/scalastyle
+++ b/scripts/jobs/validate/scalastyle
@@ -2,5 +2,5 @@ baseDir=${WORKSPACE-`pwd`}
 scriptsDir="$baseDir/scripts"
 . $scriptsDir/common
 
-sbt scalastyle
+sbt $sbtArgs scalastyle
 
-- 
cgit v1.2.3