diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2019-06-15 10:23:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-15 10:23:33 -0700 |
| commit | f6a2704f9e35f72c7e682fa71a3f64e79dd4e9e3 (patch) | |
| tree | f41efbfdab5197a96bf824f2d3c0017850fa2961 | |
| parent | 2d478849d704f44f2a1f584dbc98d3731ca4e6ee (diff) | |
Use Ubuntu 16.04 on Travis (#3059)
Travis has started to switch to Ubuntu 16.04 [0]. We were explicitly
specifying 14.04 as the `dist` in our `.travis.yml`. This commit changes
that specification to 16.04, updates the Java version, and removes
a workaround for an old Travis issue.
[0] https://changelog.travis-ci.com/xenial-as-the-default-build-environment-99476
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 40a30b100..d4de3576c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,10 @@ -# Fix Travis write errors on Clang builds. These write errors occurred after -# a Travis update to new Trusty images on Dec. 12th 2017. The reason for these -# write errors is unknown. Using the deprecated builds did not fix the problem. -# Setting 'filter_secrets: false' as suggested here -# https://github.com/travis-ci/travis-ci/issues/4704#issuecomment-321777557 -# fixes the problem. -filter_secrets: false - language: cpp cache: - apt - ccache sudo: false -dist: trusty +dist: xenial env: global: @@ -30,7 +22,7 @@ addons: - libcln-dev - libgmp-dev - libhamcrest-java - - openjdk-7-jdk + - openjdk-8-jdk - swig3.0 before_install: - eval "${MATRIX_EVAL}" @@ -45,7 +37,7 @@ before_install: sudo ln -s $(which ccache) /usr/lib/ccache/clang++ fi before_script: - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 script: - ccache -M 1G - ccache -z |