summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-04-21 20:40:17 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-04-21 20:41:00 -0700
commit04904be713480c3f095d2c9a28f771b6c419b3b6 (patch)
tree9e4e36049d1708669d17bb0d08cec36d81f7696b /scripts
parent684c314d882dcfd26558c9972cfd5acabc9f051f (diff)
downloadscala-04904be713480c3f095d2c9a28f771b6c419b3b6.tar.gz
scala-04904be713480c3f095d2c9a28f771b6c419b3b6.tar.bz2
scala-04904be713480c3f095d2c9a28f771b6c419b3b6.zip
CI: use java 6 for windows integration
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/jobs/integrate/windows3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows
index b1f94a5603..7918af71a5 100755
--- a/scripts/jobs/integrate/windows
+++ b/scripts/jobs/integrate/windows
@@ -8,6 +8,9 @@ export ANT_OPTS="-Dfile.encoding=UTF-8 -server -XX:+AggressiveOpts -XX:+UseParNe
# ant manually installed on jenkins-worker-windows-publish.
PATH=/cygdrive/c/apache-ant-1.9.6/bin:$PATH
+export JAVA_HOME='C:/java/jdk-1.6'
+export PATH="$JAVA_HOME/bin:$PATH"
+
ant \
-Dstarr.version=2.11.8 \
-Dscalac.args.optimise=-optimise \