summaryrefslogtreecommitdiff
path: root/scripts/jobs/integrate/windows
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/jobs/integrate/windows')
-rwxr-xr-xscripts/jobs/integrate/windows14
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows
index b823c1cdf9..ba48c5bc25 100755
--- a/scripts/jobs/integrate/windows
+++ b/scripts/jobs/integrate/windows
@@ -1,19 +1,15 @@
-#!/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'
+# TODO: don't hardcode these paths -- should be in scala/scala-jenkins-infra, passed in through env vars from jenkins
+export PATH='/cygdrive/c/Program Files/Java/jdk1.8.0_92/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:/Program Files/Java/jdk1.8.0_92'
java -version
javac -version
ant -version
-ant \
- -Dstarr.version=2.11.8 \
- -Dscalac.args.optimise=-optimise \
- -Dlocker.skip=1 \
- test
+ant test-opt