Merge pull request #868 from DataDog/mar-kolya/add-java12
Add java12 to the build
This commit is contained in:
commit
fc6d3a1f42
|
|
@ -115,6 +115,11 @@ jobs:
|
|||
environment:
|
||||
- TEST_TASK: testJava11
|
||||
|
||||
test_12:
|
||||
<<: *default_test_job
|
||||
environment:
|
||||
- TEST_TASK: testJava12
|
||||
|
||||
agent_integration_tests:
|
||||
<<: *defaults
|
||||
docker:
|
||||
|
|
@ -268,6 +273,12 @@ workflows:
|
|||
filters:
|
||||
tags:
|
||||
only: /.*/
|
||||
- test_12:
|
||||
requires:
|
||||
- build
|
||||
filters:
|
||||
tags:
|
||||
only: /.*/
|
||||
|
||||
- agent_integration_tests:
|
||||
requires:
|
||||
|
|
@ -298,6 +309,7 @@ workflows:
|
|||
- test_9
|
||||
- test_10
|
||||
- test_11
|
||||
- test_12
|
||||
- agent_integration_tests
|
||||
- check
|
||||
filters:
|
||||
|
|
@ -314,6 +326,7 @@ workflows:
|
|||
- test_9
|
||||
- test_10
|
||||
- test_11
|
||||
- test_12
|
||||
- agent_integration_tests
|
||||
- check
|
||||
filters:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ java {
|
|||
doFirst {
|
||||
// We do this specifically for Java7 bytecode generation because we would like to be able to compile
|
||||
// with Java8+ compiler. This likely would require some modifications when we switch to java11 compiler.
|
||||
// Using proper Java7 bootstrap and extentions allows to be sure our code will run on real Java7.
|
||||
// Using proper Java7 bootstrap and extensions allows to be sure our code will run on real Java7.
|
||||
if (JavaVersion.toVersion(sourceCompatibility) == JavaVersion.VERSION_1_7
|
||||
&& JavaVersion.current() != JavaVersion.VERSION_1_7
|
||||
&& System.env.JAVA_7_HOME != null) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue