From 446bb951ff699d39072ed7b0c90db9710eac63a2 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Apr 2016 20:43:54 -0700 Subject: CI: use java 8 for windows integration --- scripts/jobs/integrate/windows | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows index be68a826f7..615927878f 100755 --- a/scripts/jobs/integrate/windows +++ b/scripts/jobs/integrate/windows @@ -8,8 +8,8 @@ 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 -ant \ - -Dstarr.version=2.11.7 \ - -Dscalac.args.optimise=-optimise \ - -Dlocker.skip=1 \ - test +# TODO: don't hardcode here -- move to scala-jenkins-infra +export JAVA_HOME='c:/Program Files/Java/jdk1.8.0_92/' +export PATH="$JAVA_HOME/bin:$PATH" + +ant -Dscalac.args.optimise=-Yopt test -- cgit v1.2.3