Skip to content

Commit 57138ad

Browse files
committed
fix travis
1 parent 036d914 commit 57138ad

File tree

1 file changed

+2
-39
lines changed

1 file changed

+2
-39
lines changed

.travis.yml

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
language: scala
2-
3-
addons:
4-
hosts:
5-
- myshorthost
6-
hostname: myshorthost
7-
apt:
8-
packages:
9-
- graphviz
10-
- openjdk-6-jdk
11-
12-
# Needed for openjdk6
131
sudo: required
142

3+
language: scala
154
jdk:
16-
- openjdk6
175
- oraclejdk8
186
- openjdk11
197

@@ -36,32 +24,7 @@ env:
3624
- SCALAJS_VERSION=0.6.25
3725
- SCALAJS_VERSION=1.0.0-M6
3826

39-
matrix:
40-
exclude:
41-
- jdk: openjdk11
42-
env: SCALAJS_VERSION=0.6.26
43-
- jdk: openjdk11
44-
env: SCALAJS_VERSION=1.0.0-M6
45-
- scala: 2.11.12
46-
env: SCALAJS_VERSION=1.0.0-M6
47-
- scala: 2.11.12
48-
jdk: oraclejdk8
49-
- scala: 2.11.12
50-
jdk: openjdk11
51-
- scala: 2.12.8
52-
jdk: openjdk6
53-
- scala: 2.13.0-M5
54-
jdk: openjdk6
55-
include:
56-
- env: SCALANATIVE_VERSION=0.3.8
57-
jdk: oraclejdk8
58-
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-
27+
script: admin/build.sh
6528

6629
notifications:
6730
email:

0 commit comments

Comments
 (0)