Skip to content

Commit

Permalink
WIP - Update Travis CI to use JDK 11 (#3406)
Browse files Browse the repository at this point in the history
* Update .travis.yml

* Update build.sh

* Update overrides.gradle

* Update gradle.properties

* Update .travis.yml

* Update gradle.properties

* Update build.gradle

* jdk 11 fixes

* Update run-tests-simple.sh

* Update run-tests-simple.sh

* Update build.sh

* Update build.gradle

* Update run-tests-simple.sh

* Update run-tests-simple.sh
  • Loading branch information
mmoayyed authored Oct 17, 2018
1 parent 26ba8db commit abee1fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ services:
branches:
only:
- master
# Enable once Travis CI fixed JDK setup
#jdk:
#- oraclejdk11
#- oraclejdk10
before_cache:
- rm -rf $HOME/.gradle/caches/4.*/
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
Expand All @@ -27,7 +23,7 @@ before_script:
- unset -v _JAVA_OPTIONS
- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
- chmod +x install-jdk.sh
- export JAVA_HOME=$(./install-jdk.sh --emit-java-home -F 10 -c | tail --lines 1)
- export JAVA_HOME=$(./install-jdk.sh --emit-java-home -F 11 -c | tail --lines 1)
- echo $JAVA_HOME
cache:
bundler: false
Expand Down
4 changes: 2 additions & 2 deletions ci/tests/run-tests-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
prepCommand="echo 'Running command...'; "
gradle="./gradlew $@"
gradleBuild=""
gradleBuildOptions="--stacktrace --build-cache --configure-on-demand --no-daemon -DtestCategoryType=SIMPLE --scan "
gradleBuildOptions="--stacktrace --build-cache --configure-on-demand --no-daemon -DtestCategoryType=SIMPLE "

echo -e "***********************************************"
echo -e "Gradle build started at `date`"
Expand All @@ -14,7 +14,7 @@ gradleBuild="$gradleBuild test jacocoRootReport --parallel -x javadoc -x check \
-DskipNodeModulesCleanUp=true -DskipNpmCache=true -DskipNestedConfigMetadataGen=true "

if [[ "${TRAVIS_COMMIT_MESSAGE}" == *"[show streams]"* ]]; then
gradleBuild="$gradleBuild -DshowStandardStreams=true "
gradleBuild="$gradleBuild -DshowStandardStreams=true "
fi

if [[ "${TRAVIS_COMMIT_MESSAGE}" == *"[rerun tasks]"* ]]; then
Expand Down

0 comments on commit abee1fb

Please sign in to comment.