diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 20:45:54 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-04-21 20:45:54 -0700 |
| commit | 932162a6d894669fd3f36d88cbdbdf3e780cb807 (patch) | |
| tree | 9e4e36049d1708669d17bb0d08cec36d81f7696b | |
| parent | 684c314d882dcfd26558c9972cfd5acabc9f051f (diff) | |
| parent | 04904be713480c3f095d2c9a28f771b6c419b3b6 (diff) | |
| download | scala-932162a6d894669fd3f36d88cbdbdf3e780cb807.tar.gz scala-932162a6d894669fd3f36d88cbdbdf3e780cb807.tar.bz2 scala-932162a6d894669fd3f36d88cbdbdf3e780cb807.zip | |
Merge pull request #5113 from adriaanm/ci-win-java6
CI: use java 6 for windows integration
| -rwxr-xr-x | scripts/jobs/integrate/windows | 3 |
1 files changed, 3 insertions, 0 deletions
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 \ |