From 04904be713480c3f095d2c9a28f771b6c419b3b6 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Apr 2016 20:40:17 -0700 Subject: CI: use java 6 for windows integration --- scripts/jobs/integrate/windows | 3 +++ 1 file changed, 3 insertions(+) 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 \ -- cgit v1.2.3 From 2dd311f0d6d9c17d4d57d70ad6f7706b552849ef Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Apr 2016 23:41:52 -0700 Subject: CI: hardcode java path in integrate/windows script --- scripts/jobs/integrate/windows | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows index 7918af71a5..b823c1cdf9 100755 --- a/scripts/jobs/integrate/windows +++ b/scripts/jobs/integrate/windows @@ -4,12 +4,13 @@ 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, which is just where we currently have -# ant manually installed on jenkins-worker-windows-publish. -PATH=/cygdrive/c/apache-ant-1.9.6/bin:$PATH - +# 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' -export PATH="$JAVA_HOME/bin:$PATH" + +java -version +javac -version +ant -version ant \ -Dstarr.version=2.11.8 \ -- cgit v1.2.3