diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-02-15 14:36:59 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2017-02-15 14:38:16 -0800 |
| commit | ac25524aa9e54c80baf49c6eaa1a84e4d8bf15a7 (patch) | |
| tree | 84ad9a19ec6eaccb66acf573123bb93a01ddd669 | |
| parent | 096502880900d8daa75d813c63ac88aa50c25ef0 (diff) | |
| download | scala-ac25524aa9e54c80baf49c6eaa1a84e4d8bf15a7.tar.gz scala-ac25524aa9e54c80baf49c6eaa1a84e4d8bf15a7.tar.bz2 scala-ac25524aa9e54c80baf49c6eaa1a84e4d8bf15a7.zip | |
More reusable path for windows job
| -rwxr-xr-x | scripts/jobs/integrate/windows | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows index b823c1cdf9..2fb92ac261 100755 --- a/scripts/jobs/integrate/windows +++ b/scripts/jobs/integrate/windows @@ -4,9 +4,8 @@ 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 -- 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 JAVA_HOME="C:/java/jdk-1.6" +export PATH="$(cygpath $JAVA_HOME)/bin:$PATH" java -version javac -version |