From c61e637df9187b3e03edb12d5f036f5155ecfc60 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 17 Jun 2019 18:58:34 +0200 Subject: [PATCH] update Drone CI config, switch to OpenJDK on Travis --- .drone.yml | 32 ++++++++------------------------ .travis.yml | 6 +++--- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index a9da8f5..7aa8e7d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,34 +1,18 @@ kind: pipeline name: java8 -clone: - disable: true - steps: -- name: clone - image: plugins/git - settings: - depth: 10 - skip_verify: true -- name: test - image: maven:3-jdk-8-alpine - commands: - - mvn clean test + - name: test + image: maven:3-jdk-8-alpine + commands: + - mvn clean test --- kind: pipeline name: java11 -clone: - disable: true - steps: -- name: clone - image: plugins/git - settings: - depth: 10 - skip_verify: true -- name: test - image: maven:3-jdk-11-slim - commands: - - mvn clean test + - name: test + image: maven:3-jdk-11-slim + commands: + - mvn clean test diff --git a/.travis.yml b/.travis.yml index 9cbbcf5..143b7b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java jdk: - - oraclejdk8 - - oraclejdk11 + - openjdk8 + - openjdk11 install: true addons: sonarcloud: @@ -13,4 +13,4 @@ cache: - '$HOME/.m2/repository' - '$HOME/.sonar/cache' script: - - mvn -P jacoco clean package sonar:sonar + - if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then mvn -P jacoco clean package sonar:sonar; else mvn clean test; fi