From f61063eeb6a6a96e086e60e87fd125d411291111 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Thu, 15 Oct 2020 15:41:46 +0200 Subject: [PATCH] build: replace jabba by proper debian installation --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca14a3a7702..f18b490ce1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,20 @@ git: before_install: # make comparing to origin/master work - git remote set-branches --add origin master && git fetch - # using jabba for custom jdk management - - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.1/install.sh | bash && . ~/.jabba/jabba.sh - - jabba install adopt@1.8-0 - - jabba use "adopt@1.8-0" + - sudo update-java-alternatives -l + - sudo update-java-alternatives -s adoptopenjdk-8-hotspot-amd64 + - whereis java - java -version addons: apt: + sources: + # Official debian package for AdoptOpenJDK from https://adoptopenjdk.net/installation.html#linux-pkg + - sourceline: deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ xenial main + key_url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public packages: - - graphviz + - graphviz + - adoptopenjdk-8-hotspot before_cache: - find $HOME/.ivy2 -name "ivydata-*.properties" -print -delete @@ -30,7 +34,6 @@ cache: directories: - $HOME/.ivy2/cache - $HOME/.sbt/boot - - $HOME/.jabba/jdk - $HOME/.cache/coursier script: