Fix jdk 9 build.

This commit is contained in:
Erik C. Thauvin 2017-11-06 19:11:45 -08:00
parent 81a36cdf46
commit 46768519e7

View file

@ -1,7 +1,5 @@
defaults: &defaults defaults: &defaults
working_directory: ~/repo working_directory: ~/repo
docker:
- image: circleci/openjdk:8-jdk
environment: environment:
JVM_OPTS: -Xmx3200m JVM_OPTS: -Xmx3200m
TERM: dumb TERM: dumb
@ -9,17 +7,13 @@ defaults: &defaults
version: 2.0 version: 2.0
jobs: jobs:
jdk8:
docker:
- image: circleci/openjdk:8-jdk
jdk9:
docker:
- image: circleci/openjdk:9-jdk
build_gradle: build_gradle:
<<: *defaults <<: *defaults
docker:
- image: circleci/openjdk:8-jdk
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -49,6 +43,9 @@ jobs:
build_kobalt: build_kobalt:
<<: *defaults <<: *defaults
docker:
- image: circleci/openjdk:8-jdk
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -75,18 +72,42 @@ jobs:
- store_test_results: - store_test_results:
path: kobaltBuild/test-output/ path: kobaltBuild/test-output/
build_gradle_jdk9:
<<: *defaults
docker:
- image: circleci/openjdk:9-jdk
steps:
- checkout
- restore_cache:
keys:
- gradle-dependencies-{{ checksum "build.gradle" }}
# fallback to using the latest cache if no exact match is found
- gradle-dependencies-
- run:
name: Gradle Dependencies
command: ./gradlew dependencies
- save_cache:
paths: ~/.m2
key: gradle-dependencies-{{ checksum "build.gradle" }}
- run:
name: Run All Checks
command: ./gradlew check
- store_artifacts:
path: build/reports/
destination: reports
- store_test_results:
path: build/reports/
workflows: workflows:
version: 2 version: 2
build_jdk8: build_jdk8:
jobs: jobs:
- build_gradle - build_gradle
requires:
- jdk8
- build_kobalt - build_kobalt
requires: - build_gradle_jdk9
- jdk8
build_jdk9:
jobs:
- build_gradle
requires:
- jdk9