Skip to content

Commit

Permalink
Merge pull request #629 from sormuras/load-install-jdk-on-the-fly
Browse files Browse the repository at this point in the history
Add JDK 11 and load install-jdk.sh on-the-fly
  • Loading branch information
swankjesse committed Apr 28, 2018
2 parents 371b82e + 3c68a05 commit c8b9bc8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 48 deletions.
43 changes: 0 additions & 43 deletions .buildscript/install-jdk.sh

This file was deleted.

23 changes: 18 additions & 5 deletions .travis.yml
Expand Up @@ -2,14 +2,27 @@ language: java

matrix:
include:
- env: JDK='OracleJDK 8'
- env: JDK='Oracle JDK 8'
jdk: oraclejdk8
- env: JDK='OracleJDK 9'
- env: JDK='Oracle JDK 9'
jdk: oraclejdk9
- env: JDK='OracleJDK 10'
install: . ./.buildscript/install-jdk.sh -F 10 -L BCL
- env: JDK='Oracle JDK 10'
install: . ./install-jdk.sh -F 10 -L BCL
- env: JDK='OpenJDK 10'
install: . ./.buildscript/install-jdk.sh -F 10 -L GPL
install: . ./install-jdk.sh -F 10 -L GPL
- env: JDK='Oracle JDK 11'
install: . ./install-jdk.sh -F 11 -L BCL
- env: JDK='OpenJDK 11'
install: . ./install-jdk.sh -F 11 -L GPL
allow_failures:
# ErrorProne/javac is not yet working on JDK 11
- env: JDK='Oracle JDK 11'
- env: JDK='OpenJDK 11'

# Direct usage of `install-jdk.sh` might be superseded by https://github.com/travis-ci/travis-build/pull/1347
before_install:
- unset _JAVA_OPTIONS
- wget https://github.com/sormuras/bach/raw/1.0.1/install-jdk.sh

after_success:
- .buildscript/deploy_snapshot.sh
Expand Down

0 comments on commit c8b9bc8

Please sign in to comment.