summaryrefslogtreecommitdiff
path: root/scripts/jobs/integrate/windows
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/jobs/integrate/windows')
-rwxr-xr-xscripts/jobs/integrate/windows28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows
index b823c1cdf9..f5e068684e 100755
--- a/scripts/jobs/integrate/windows
+++ b/scripts/jobs/integrate/windows
@@ -1,19 +1,19 @@
-#!/bin/bash -x
+#!/bin/bash
-./pull-binary-libs.sh
-
-export ANT_OPTS="-Dfile.encoding=UTF-8 -server -XX:+AggressiveOpts -XX:+UseParNewGC -Xmx2G -Xss1M -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=128M"
-
-# TODO: don't hardcode this path -- should be in scala/scala-jenkins-infra
-export PATH='/cygdrive/c/java/jdk-1.6/bin:/cygdrive/c/apache-ant-1.9.6/bin:/cygdrive/c/Program Files (x86)/Git-2.5.3/Cmd:/bin:/usr/bin:'
-export JAVA_HOME='C:/java/jdk-1.6'
+baseDir=${WORKSPACE-`pwd`}
+scriptsDir="$baseDir/scripts"
+. $scriptsDir/common
java -version
javac -version
-ant -version
-ant \
- -Dstarr.version=2.11.8 \
- -Dscalac.args.optimise=-optimise \
- -Dlocker.skip=1 \
- test
+generateRepositoriesConfig
+
+SBT="java $JAVA_OPTS -Dsbt.ivy.home=$WORKSPACE/.ivy2 -jar $sbtLauncher -Dsbt.override.build.repos=true -Dsbt.repository.config=$sbtRepositoryConfig"
+
+# Build locker with STARR
+$SBT --warn "setupPublishCore" generateBuildCharacterPropertiesFile publishLocal
+
+# Build quick and run the tests
+parseScalaProperties buildcharacter.properties
+$SBT -Dstarr.version=$maven_version_number --warn "setupValidateTest" testAll