diff options
| author | Jesse Wilson <jesse@swank.ca> | 2018-04-28 10:56:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-28 10:56:08 -0400 |
| commit | c8b9bc8ffa85f1a14d1767ed514ef5797fbd8311 (patch) | |
| tree | a52472d476a2ef0f3c486ad141e8bae6f636f44a | |
| parent | 371b82e8159170052f06f6a5e9dd8ed5f0a2bef1 (diff) | |
| parent | 3c68a054848124bf53aa2f73b1c310c6fffa3d0b (diff) | |
| download | javapoet-c8b9bc8ffa85f1a14d1767ed514ef5797fbd8311.tar.gz | |
Merge pull request #629 from sormuras/load-install-jdk-on-the-fly
Add JDK 11 and load install-jdk.sh on-the-fly
| -rw-r--r-- | .buildscript/install-jdk.sh | 43 | ||||
| -rw-r--r-- | .travis.yml | 23 |
2 files changed, 18 insertions, 48 deletions
diff --git a/.buildscript/install-jdk.sh b/.buildscript/install-jdk.sh deleted file mode 100644 index 481d487..0000000 --- a/.buildscript/install-jdk.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# Install JDK from "download.java.net" -# -# Adapted from https://github.com/sormuras/bach/blob/master/install-jdk.sh -# - -set -e - -JDK_FEATURE='10' - -TMP=$(curl -L jdk.java.net/${JDK_FEATURE}) -TMP="${TMP#*Most recent build: jdk-${JDK_FEATURE}+}" # remove everything before the number -TMP="${TMP%%<*}" # remove everything after the number -JDK_BUILD="$(echo -e "${TMP}" | tr -d '[:space:]')" # remove all whitespace - -JDK_LICENSE='GPL' - -while getopts F:B:L: option -do - case "${option}" - in - F) JDK_FEATURE=${OPTARG};; - B) JDK_BUILD=${OPTARG};; - L) JDK_LICENSE=${OPTARG};; - esac -done - -JDK_BASENAME='jdk' -if [ "${JDK_LICENSE}" == 'GPL' ]; then - JDK_BASENAME='openjdk' -fi - -JDK_ARCHIVE=${JDK_BASENAME}-${JDK_FEATURE}+${JDK_BUILD}_linux-x64_bin.tar.gz - -cd ~ -wget http://download.java.net/java/jdk${JDK_FEATURE}/archive/${JDK_BUILD}/${JDK_LICENSE}/${JDK_ARCHIVE} -tar -xzf ${JDK_ARCHIVE} -export JAVA_HOME=~/jdk-${JDK_FEATURE} -export PATH=${JAVA_HOME}/bin:$PATH -cd - - -java --version diff --git a/.travis.yml b/.travis.yml index ff7cc24..4e0a881 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 |