Skip to content

Commit

Permalink
Issue #6687: set up JDK12 build
Browse files Browse the repository at this point in the history
  • Loading branch information
rnveach committed Apr 26, 2019
1 parent f7626ac commit 1feb005
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .ci/travis/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ javac8)
done
;;

jdk12)
# powermock doesn't support modifying final fields in JDK12
exclude1="\!FileContentsTest#testGetJavadocBefore,\!FileTextTest#testFindLine*,"
exclude2="\!MainFrameModelPowerTest#testOpenFileWithUnknownParseMode,"
exclude3="\!TokenUtilTest#testTokenValueIncorrect2,"
exclude4="\!ImportControlLoaderPowerTest#testInputStreamThatFailsOnClose"

mvn -e package -Passembly -Dtest=$exclude1$exclude2$exclude3$exclude4
mvn -e site -Dlinkcheck.skip=true
;;

nondex)
mvn -e --fail-never clean nondex:nondex -DargLine='-Xms1024m -Xmx2048m'
cat `grep -RlE 'td class=.x' .nondex/ | cat` < /dev/null > output.txt
Expand Down
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,19 @@ matrix:
- CMD2="mvn -e package -Passembly"
- CMD="export JAVA_HOME=$(/usr/libexec/java_home) && $CMD1 && $CMD2"

# MacOS JDK12 verify (till cache is not working, we can not do verify)
- os: osx
osx_image: xcode10.2
env:
- DESC="MacOS JDK12 verify, site, assembly
- exclude1="!FileContentsTest#testGetJavadocBefore,!FileTextTest#testFindLine*,"
- exclude2="!MainFrameModelPowerTest#testOpenFileWithUnknownParseMode,"
- exclude3="!TokenUtilTest#testTokenValueIncorrect2,"
- exclude4="!ImportControlLoaderPowerTest#testInputStreamThatFailsOnClose"
- CMD1="mvn -e package -Dlinkcheck.skip=true -Dtest=$exclude1$exclude2$exclude3$exclude4"
- CMD2="mvn -e package -Passembly -Dtest=$exclude1$exclude2$exclude3"
- CMD="export JAVA_HOME=$(/usr/libexec/java_home) && $CMD1 && $CMD2"

# https://sonarcloud.io (oraclejdk8)
- jdk: oraclejdk8
env:
Expand Down Expand Up @@ -212,6 +225,12 @@ matrix:
- DESC="build with OpenJDK11"
- CMD="mvn -e package -Passembly && mvn -e site -Dlinkcheck.skip=true"

# OpenJDK12 build
- jdk: openjdk12
env:
- DESC="build with OpenJDK12"
- CMD="./.ci/travis/travis.sh jdk12"

# OracleJDK9 build
- jdk: oraclejdk9
env:
Expand Down
19 changes: 19 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ environment:
- JAVA_HOME: C:\Program Files\Java\jdk11
DESC: "verify without checkstyle (JDK11)"
CMD1: "mvn -e verify -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true"
# verify without checkstyle (JDK12)
# Spotbugs check is disabled till https://github.com/spotbugs/spotbugs/issues/259
- JAVA_HOME: C:\Program Files\Java\jdk12
DESC: "verify without checkstyle (JDK12)"
CMD1: "mvn -e verify -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true"
CMD2: " -Dtest=!FileContentsTest#testGetJavadocBefore,!FileTextTest#testFindLine*,"
CMD3: "!MainFrameModelPowerTest#testOpenFileWithUnknownParseMode,"
CMD4: "!TokenUtilTest#testTokenValueIncorrect2,"
CMD5: "!ImportControlLoaderPowerTest#testInputStreamThatFailsOnClose"
CMD6: " -Djacoco.skip=true"
# site, without verify (JDK8)
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
DESC: "site, without verify (JDK8)"
Expand All @@ -112,6 +122,15 @@ environment:
- JAVA_HOME: C:\Program Files\Java\jdk11
DESC: "site, without verify (JDK11)"
CMD1: "mvn -e -Pno-validations site"
# site, without verify (JDK12)
- JAVA_HOME: C:\Program Files\Java\jdk12
DESC: "site, without verify (JDK12)"
CMD1: "mvn -e -Pno-validations site"
CMD2: " -Dtest=!FileContentsTest#testGetJavadocBefore,!FileTextTest#testFindLine*,"
CMD3: "!MainFrameModelPowerTest#testOpenFileWithUnknownParseMode,"
CMD4: "!TokenUtilTest#testTokenValueIncorrect2,"
CMD5: "!ImportControlLoaderPowerTest#testInputStreamThatFailsOnClose"
CMD6: " -Djacoco.skip=true"

build_script:
- ps: >
Expand Down

0 comments on commit 1feb005

Please sign in to comment.