diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 23:41:52 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 23:41:52 -0700 |
| commit | 2dd311f0d6d9c17d4d57d70ad6f7706b552849ef (patch) | |
| tree | 7c5ac02c252dd07809adceb75d11ea62536f5feb /scripts | |
| parent | 932162a6d894669fd3f36d88cbdbdf3e780cb807 (diff) | |
| download | scala-2dd311f0d6d9c17d4d57d70ad6f7706b552849ef.tar.gz scala-2dd311f0d6d9c17d4d57d70ad6f7706b552849ef.tar.bz2 scala-2dd311f0d6d9c17d4d57d70ad6f7706b552849ef.zip | |
CI: hardcode java path in integrate/windows script
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/windows | 11 |
1 files 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 \ |