diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 20:47:25 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 20:47:25 -0700 |
| commit | 3ad8c3a3900fc526a65cfe65e6b2c7dbb59d7270 (patch) | |
| tree | 02e16430e768068f51703bd392d776d6945925bf | |
| parent | d24e298cbd955101a6b4342602b32ed37643dfb0 (diff) | |
| parent | 446bb951ff699d39072ed7b0c90db9710eac63a2 (diff) | |
| download | scala-3ad8c3a3900fc526a65cfe65e6b2c7dbb59d7270.tar.gz scala-3ad8c3a3900fc526a65cfe65e6b2c7dbb59d7270.tar.bz2 scala-3ad8c3a3900fc526a65cfe65e6b2c7dbb59d7270.zip | |
Merge pull request #5114 from adriaanm/ci-win-java8
CI: use java 8 for windows integration
| -rwxr-xr-x | scripts/jobs/integrate/windows | 10 |
1 files 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 |