Updated to jdk 9 & 14, maybe.

This commit is contained in:
Erik C. Thauvin 2020-03-28 17:29:35 -07:00
parent f16508dae4
commit 6bf2d6fdb1
2 changed files with 13 additions and 11 deletions

View file

@ -30,19 +30,19 @@ defaults_gradle: &defaults_gradle
path: build/reports/ path: build/reports/
jobs: jobs:
build_gradle_jdk12: build_gradle_jdk14:
<<: *defaults <<: *defaults
docker: docker:
- image: openjdk:12-jdk - image: cimg/openjdk:14.0
<<: *defaults_gradle <<: *defaults_gradle
build_gradle_jdk8: build_gradle_jdk9:
<<: *defaults <<: *defaults
docker: docker:
- image: circleci/openjdk:8-jdk - image: circleci/openjdk:9
<<: *defaults_gradle <<: *defaults_gradle
@ -50,6 +50,6 @@ workflows:
version: 2 version: 2
gradle: gradle:
jobs: jobs:
- build_gradle_jdk8 - build_gradle_jdk9
- build_gradle_jdk12 - build_gradle_jdk14

View file

@ -5,6 +5,12 @@ env:
global: global:
- CI=true - CI=true
matrix:
include:
- jdk: openjdk9
- env: JDK='OpenJDK 14'
install: . ./install-jdk.sh -F 14 -C
install: install:
- git fetch --unshallow --tags - git fetch --unshallow --tags
@ -12,15 +18,11 @@ addons:
sonarcloud: sonarcloud:
organization: "ethauvin-github" organization: "ethauvin-github"
jdk:
- oraclejdk8
- openjdk12
before_install: before_install:
- chmod +x gradlew - chmod +x gradlew
after_success: after_success:
- | - |
if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk8 ]; then if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk9 ]; then
./gradlew sonarqube ./gradlew sonarqube
fi fi