Skip to content

Commit 8335c40

Browse files
committed
Fix Travis CI build
1 parent 461f27e commit 8335c40

File tree

2 files changed

+19
-135
lines changed

2 files changed

+19
-135
lines changed

.travis.yml

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,31 @@ branches:
88
except:
99
- /^r\d.*$/
1010

11+
# Get latest install-jdk.sh script
12+
before_install:
13+
- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
14+
1115
matrix:
1216
include:
13-
# Java 9 "Oracle JDK" (provided by Travis CI)
14-
- jdk: oraclejdk9
15-
env: JDK_RELEASE='Oracle JDK 9' EXTRA_GRADLE_ARGS='-PenableJaCoCo'
16-
install: echo "Don't let Travis CI execute './gradlew assemble' by default"
17-
# Java 9 "OpenJDK"
18-
- env: JDK_RELEASE='OpenJDK 9' EXTRA_GRADLE_ARGS=''
19-
install: . ./src/install/install-jdk.sh -F 9 -L GPL
20-
# Java 10 "Oracle JDK"
21-
- env: JDK_RELEASE='Oracle JDK 10' EXTRA_GRADLE_ARGS=''
22-
install: . ./src/install/install-jdk.sh -F 10 -L BCL
17+
# Java 10 "Oracle JDK" (not yet provided by Travis CI)
18+
- env: JDK='Oracle JDK 10'
19+
install: . ./install-jdk.sh -F 10 -L BCL
2320
# Java 10 "OpenJDK"
24-
- env: JDK_RELEASE='OpenJDK 10' EXTRA_GRADLE_ARGS=''
25-
install: . ./src/install/install-jdk.sh -F 10 -L GPL
21+
- env: JDK='OpenJDK 10' JACOCO='-PenableJaCoCo'
22+
install: . ./install-jdk.sh -F 10 -L GPL
23+
# Java 11 "Oracle JDK"
24+
- env: JDK='Oracle JDK 11'
25+
install: . ./install-jdk.sh -F 11 -L BCL
26+
# The following environments are known to fail
27+
allow_failures:
28+
- env: JDK='Oracle JDK 11'
2629

2730
script:
2831
# Display Gradle, Groovy, JVM and other versions
29-
- ./gradlew -version
32+
- ./gradlew --version
3033
# Build JUnit 5
31-
- ./gradlew build $EXTRA_GRADLE_ARGS --scan --stacktrace -Dkotlin.compiler.execution.strategy="in-process"
32-
33-
# Do not store unnecessary files from Gradle dependency cache
34-
before_cache:
35-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
36-
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
37-
38-
# Store Gradle dependency cache and Gradle Wrapper files for next execution
39-
cache:
40-
directories:
41-
- $HOME/.gradle/caches/
42-
- $HOME/.gradle/wrapper/
34+
- ./gradlew --scan --stacktrace --warning-mode=all ${JACOCO} build
4335

44-
# Run clover report and send report to codecov after build success for JDK 9 builds
36+
# If variable JACOCO is set, run JaCoCo report and send report to codecov.io after build success
4537
after_success:
46-
- test "$JDK_RELEASE" = "Oracle JDK 9" && ./gradlew -PenableJaCoCo jacocoRootReport || true
47-
- test "$JDK_RELEASE" = "Oracle JDK 9" && bash <(curl -s https://codecov.io/bash) || true
38+
- test -v JACOCO && ./gradlew ${JACOCO} jacocoRootReport && bash <(curl -s https://codecov.io/bash) || true

src/install/install-jdk.sh

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)