Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit d2a047d

Browse files
authored
Replace oraclejdk8 with openjdk8 and remove jdk_switcher from Travis (#1967)
1 parent 7261684 commit d2a047d

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ language: java
55
matrix:
66
fast_finish: true
77
include:
8-
- jdk: oraclejdk8
8+
- jdk: openjdk8
99
env: TASK=BUILD
1010
os: linux
1111

@@ -22,19 +22,19 @@ matrix:
2222
# env: TASK=BUILD
2323
# os: linux
2424

25-
- jdk: oraclejdk8
25+
- jdk: openjdk8
2626
env: TASK=CHECKER_FRAMEWORK
2727
os: linux
2828

2929
- env: TASK=CHECK_GIT_HISTORY
3030
os: linux
3131

3232
# Build example projects last, since they are affected by fewer pull requests.
33-
- jdk: oraclejdk8
33+
- jdk: openjdk8
3434
env: TASK=BUILD_EXAMPLES_GRADLE
3535
os: linux
3636

37-
- jdk: oraclejdk8
37+
- jdk: openjdk8
3838
env: TASK=BUILD_EXAMPLES_MAVEN
3939
os: linux
4040

@@ -59,8 +59,8 @@ script:
5959
- buildscripts/travis_script
6060

6161
after_success:
62-
- if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" \] && \[ "$TRAVIS_OS_NAME" = linux \]; then
63-
bash <(curl -s https://codecov.io/bash) ;
62+
- if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "openjdk8" \] && \[ "$TRAVIS_OS_NAME" = linux \]; then
63+
bash <(curl -s https://codecov.io/bash) ;
6464
fi
6565

6666
before_cache:

buildscripts/travis_script

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ case "$TASK" in
1313
"BUILD")
1414
case "$TRAVIS_OS_NAME" in
1515
"linux")
16-
source /opt/jdk_switcher/jdk_switcher.sh
17-
export JAVA8_HOME="$(jdk_switcher home oraclejdk8)"
1816
case "$TRAVIS_JDK_VERSION" in
1917
"oraclejdk9")
2018
./gradlew clean assemble check --stacktrace
@@ -25,8 +23,7 @@ case "$TASK" in
2523
"openjdk11")
2624
./gradlew clean assemble check --stacktrace
2725
;;
28-
"oraclejdk8")
29-
export JAVA_HOMES="$(jdk_switcher home oraclejdk8)/jre:$(jdk_switcher home oraclejdk9)"
26+
"openjdk8")
3027
./gradlew clean assemble --stacktrace
3128
./gradlew check :opencensus-all:jacocoTestReport
3229
./gradlew verGJF

0 commit comments

Comments
 (0)