Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Update Travis CI to use JDK 11 #3406

Merged
merged 43 commits into from
Oct 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7a6b232
Update .travis.yml
SavvasMisaghMoayyed Jul 14, 2018
eef529a
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Jul 16, 2018
4f0876e
Update build.sh
SavvasMisaghMoayyed Jul 16, 2018
d89ff0c
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Jul 16, 2018
89779f9
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Jul 16, 2018
e577065
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Jul 23, 2018
992b4bf
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Jul 26, 2018
964faf6
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Jul 29, 2018
b0aea9c
Update overrides.gradle
SavvasMisaghMoayyed Jul 29, 2018
b9f9bcd
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 6, 2018
15f4307
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 6, 2018
09f75d5
Update gradle.properties
SavvasMisaghMoayyed Aug 13, 2018
5408bd4
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 13, 2018
2b4c6bc
Update .travis.yml
SavvasMisaghMoayyed Aug 13, 2018
f0e8773
Update gradle.properties
SavvasMisaghMoayyed Aug 15, 2018
8b3e7fb
Update build.gradle
SavvasMisaghMoayyed Aug 20, 2018
0214b19
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 20, 2018
2b579aa
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 20, 2018
cc6a00f
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 21, 2018
3321fa6
jdk 11 fixes
SavvasMisaghMoayyed Aug 21, 2018
5d61e78
Update run-tests-simple.sh
SavvasMisaghMoayyed Aug 21, 2018
06b30b5
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Aug 28, 2018
bfc219b
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 4, 2018
f8f9125
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 14, 2018
f523325
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 17, 2018
806c3b6
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 24, 2018
a23a31f
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 24, 2018
8a7aeb9
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 25, 2018
2b5f15c
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 25, 2018
061ef3c
Update run-tests-simple.sh
SavvasMisaghMoayyed Sep 25, 2018
5d97133
Update build.sh
SavvasMisaghMoayyed Sep 25, 2018
ab5996c
Update build.gradle
SavvasMisaghMoayyed Sep 25, 2018
63a02ee
Update run-tests-simple.sh
SavvasMisaghMoayyed Sep 25, 2018
4178781
Update run-tests-simple.sh
SavvasMisaghMoayyed Sep 26, 2018
e9debe6
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Sep 28, 2018
afd2058
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Oct 1, 2018
ae45956
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Oct 1, 2018
2541ca6
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Oct 5, 2018
5ab184f
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Oct 10, 2018
0b0208e
Merge branch 'master' into travis-ci-jdk11
SavvasMisaghMoayyed Oct 12, 2018
6baa92f
Merge branch 'master' into travis-ci-jdk11
mmoayyed Oct 15, 2018
bfc66f5
Merge branch 'master' into travis-ci-jdk11
mmoayyed Oct 15, 2018
6e2d424
Merge branch 'master' into travis-ci-jdk11
mmoayyed Oct 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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