Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Excavator: Use Java 11 for building libraries (#32)
  • Loading branch information
svc-excavator-bot committed Jun 18, 2021
1 parent 0b22d24 commit bcd0baa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 33 deletions.
37 changes: 6 additions & 31 deletions .circleci/config.yml
Expand Up @@ -5,7 +5,7 @@
version: 2.1
jobs:
compile:
docker: [{ image: 'cimg/openjdk:8.0.282-node' }]
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: large
environment:
CIRCLE_TEST_REPORTS: /home/circleci/junit
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
paths: [ project, .gradle/init.gradle ]

check:
docker: [{ image: 'cimg/openjdk:8.0.282-node' }]
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: medium
environment:
CIRCLE_TEST_REPORTS: /home/circleci/junit
Expand All @@ -76,7 +76,7 @@ jobs:
- store_artifacts: { path: ~/artifacts }

unit-test:
docker: [{ image: 'cimg/openjdk:8.0.282-node' }]
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: large
environment:
CIRCLE_TEST_REPORTS: /home/circleci/junit
Expand All @@ -97,28 +97,6 @@ jobs:
- store_test_results: { path: ~/junit }
- store_artifacts: { path: ~/artifacts }

unit-test-11:
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: large
environment:
CIRCLE_TEST_REPORTS: /home/circleci/junit
CIRCLE_ARTIFACTS: /home/circleci/artifacts
GRADLE_OPTS: -Dorg.gradle.jvmargs='-Xmx2g' -Dorg.gradle.workers.max=2
_JAVA_OPTIONS: -XX:ActiveProcessorCount=4 -XX:MaxRAM=8g -XX:ErrorFile=/home/circleci/artifacts/hs_err_pid%p.log -XX:HeapDumpPath=/home/circleci/artifacts
steps:
- checkout
- restore_cache: { key: 'gradle-wrapper-v2-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}' }
- restore_cache: { key: 'unit-test-11-gradle-cache-v2-{{ checksum "versions.props" }}-{{ checksum "build.gradle" }}' }
- run: ./gradlew --parallel --stacktrace --continue test -Pcom.palantir.baseline-error-prone.disable
- save_cache:
key: 'unit-test-11-gradle-cache-v2-{{ checksum "versions.props" }}-{{ checksum "build.gradle" }}'
paths: [ ~/.gradle/caches ]
- run:
command: mkdir -p ~/junit && find . -type f -regex ".*/build/.*TEST.*xml" -exec cp --parents {} ~/junit/ \;
when: always
- store_test_results: { path: ~/junit }
- store_artifacts: { path: ~/artifacts }

unit-test-15:
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: large
Expand Down Expand Up @@ -149,7 +127,7 @@ jobs:
- store_artifacts: { path: ~/artifacts }

trial-publish:
docker: [{ image: 'cimg/openjdk:8.0.282-node' }]
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: medium
environment:
CIRCLE_TEST_REPORTS: /home/circleci/junit
Expand All @@ -171,7 +149,7 @@ jobs:
- store_artifacts: { path: ~/artifacts }

publish:
docker: [{ image: 'cimg/openjdk:8.0.282-node' }]
docker: [{ image: 'cimg/openjdk:11.0.10-node' }]
resource_class: medium
environment:
CIRCLE_TEST_REPORTS: /home/circleci/junit
Expand Down Expand Up @@ -211,9 +189,6 @@ workflows:
requires: [ compile ]
filters: { tags: { only: /.*/ } }

- unit-test-11:
filters: { tags: { only: /.*/ } }

- unit-test-15:
filters: { tags: { only: /.*/ } }

Expand All @@ -229,5 +204,5 @@ workflows:
filters: { branches: { ignore: develop } }

- publish:
requires: [ unit-test, unit-test-11, unit-test-15, check, trial-publish ]
requires: [ unit-test, unit-test-15, check, trial-publish ]
filters: { tags: { only: /.*/ }, branches: { only: develop } }
3 changes: 1 addition & 2 deletions .circleci/template.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
export CIRCLECI_TEMPLATE=java-library-oss
export JDK=8
export UNIT_TEST_11=true
export JDK=11
export UNIT_TEST_15=true

0 comments on commit bcd0baa

Please sign in to comment.