diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 23:48:09 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 23:48:09 -0700 |
| commit | f55dd2084eca97c576a982473ab6701f98fb79a7 (patch) | |
| tree | 69f77b1dd93de462cf3e8a9ca47919859872a0db /scripts | |
| parent | 6863c5c390d59f4ccee4f1b877479128a8682820 (diff) | |
| download | scala-f55dd2084eca97c576a982473ab6701f98fb79a7.tar.gz scala-f55dd2084eca97c576a982473ab6701f98fb79a7.tar.bz2 scala-f55dd2084eca97c576a982473ab6701f98fb79a7.zip | |
CI: hardcode java path in integrate/windows script
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/windows | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows index 8eed95aeef..ba48c5bc25 100755 --- a/scripts/jobs/integrate/windows +++ b/scripts/jobs/integrate/windows @@ -1,15 +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, 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 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' -# 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" +java -version +javac -version +ant -version ant test-opt |