Skip to content

Commit 036d914

Browse files
committed
fix travis
1 parent c34900d commit 036d914

File tree

1 file changed

+22
-25
lines changed

1 file changed

+22
-25
lines changed

.travis.yml

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# needed to work around https://github.com/travis-ci/travis-ci/issues/9713
2-
sudo: true
3-
41
language: scala
52

63
addons:
@@ -10,6 +7,20 @@ addons:
107
apt:
118
packages:
129
- graphviz
10+
- openjdk-6-jdk
11+
12+
# Needed for openjdk6
13+
sudo: required
14+
15+
jdk:
16+
- openjdk6
17+
- oraclejdk8
18+
- openjdk11
19+
20+
scala:
21+
- 2.11.12
22+
- 2.12.8
23+
- 2.13.0-M5
1324

1425
env:
1526
global:
@@ -20,32 +31,11 @@ env:
2031
# SONA_PASS
2132
- secure: "OIVtcj7AHZr8Grpf03ZmZsygcADewiYIvSnRwLYCx+5AqOzs39EZ68DsIOxi7wEXVUbVj5RvLXpKzLX3iN+UszLOQRoFPFQyyn+3Y50f8T2aRxdZtInzXn0sCVTj4Hhd/zbKl1W+2Nh3Sqazab7tFoQVzEyYqhcPeiNRMF7h+aY="
2233
matrix:
34+
# The empty SCALAJS_VERSION will only compile for the JVM
2335
- SCALAJS_VERSION=
2436
- SCALAJS_VERSION=0.6.25
2537
- SCALAJS_VERSION=1.0.0-M6
2638

27-
script:
28-
- echo $JAVA_HOME
29-
# work around https://github.com/travis-ci/travis-ci/issues/9713
30-
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
31-
- java -version
32-
- admin/build.sh
33-
34-
addons:
35-
apt:
36-
packages:
37-
- openjdk-6-jdk
38-
39-
jdk:
40-
- openjdk6
41-
- oraclejdk8
42-
- openjdk11
43-
44-
scala:
45-
- 2.11.12
46-
- 2.12.8
47-
- 2.13.0-M5
48-
4939
matrix:
5040
exclude:
5141
- jdk: openjdk11
@@ -66,6 +56,13 @@ matrix:
6656
- env: SCALANATIVE_VERSION=0.3.8
6757
jdk: oraclejdk8
6858

59+
script:
60+
# work around https://github.com/travis-ci/travis-ci/issues/9713
61+
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
62+
- java -version
63+
- admin/build.sh
64+
65+
6966
notifications:
7067
email:
7168

0 commit comments

Comments
 (0)