Skip to content

Commit f20da4a

Browse files
committed
Use AdoptOpenJDK JDK 8 and 11
1 parent 2234e39 commit f20da4a

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

.travis.yml

+26-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
language: scala
1+
sudo: false
2+
dist: xenial
3+
group: stable
24

3-
jdk:
4-
- openjdk8
5-
- openjdk11
5+
language: scala
66

77
scala:
88
- 2.12.8
@@ -19,20 +19,30 @@ env:
1919
- secure: "Xw7rI/qlML1nD2e2XwlakkhKAWNGZKqqE+Q3ntTvFpfHryl7KLCvVzJ4LIavnL6kGJaWOgy9vlSoEWn5g9nqHSfE31C/k5pY5nTMAKiwiJzfAS+r0asKXW2gmKhwtcTBkqyLVOZLCJSPVlFRQyfBJHY+Fs0L3KWcnMQgtBlyDhU="
2020
matrix:
2121
# The empty SCALAJS_VERSION will only compile for the JVM
22-
- SCALAJS_VERSION=
23-
- SCALAJS_VERSION=0.6.28
24-
- SCALAJS_VERSION=1.0.0-M8
22+
- SCALAJS_VERSION= ADOPTOPENJDK=8
23+
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
24+
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
25+
- SCALAJS_VERSION= ADOPTOPENJDK=11
2526

2627
matrix:
2728
exclude:
28-
- jdk: openjdk11
29-
env: SCALAJS_VERSION=0.6.28
30-
- jdk: openjdk11
31-
env: SCALAJS_VERSION=1.0.0-M8
3229
- scala: 0.15.0-RC1
33-
env: SCALAJS_VERSION=0.6.28
30+
env: SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
3431
- scala: 0.15.0-RC1
35-
env: SCALAJS_VERSION=1.0.0-M8
32+
env: SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
33+
34+
before_install:
35+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
36+
- "[[ -d /home/travis/.sdkman/ ]] && [[ -d /home/travis/.sdkman/bin/ ]] || rm -rf /home/travis/.sdkman/"
37+
- curl -sL https://get.sdkman.io | bash
38+
- echo sdkman_auto_answer=true > /home/travis/.sdkman/etc/config
39+
- source "/home/travis/.sdkman/bin/sdkman-init.sh"
40+
41+
install:
42+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | tail -1)
43+
- unset _JAVA_OPTIONS
44+
- unset JAVA_HOME
45+
- java -Xmx32m -version
3646

3747
script:
3848
- admin/build.sh
@@ -42,5 +52,6 @@ before_cache:
4252
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
4353
cache:
4454
directories:
45-
- $HOME/.ivy2/cache
46-
- $HOME/.sbt
55+
- $HOME/.ivy2/cache
56+
- $HOME/.sbt
57+
- $HOME/.sdkman

admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set -e
1616
# of the existing tag. Then a new tag can be created for that commit, e.g., `v1.2.3#2.13.0-M5`.
1717
# Everything after the `#` in the tag name is ignored.
1818

19-
if [[ "$TRAVIS_JDK_VERSION" == "openjdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
19+
if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
2020
RELEASE_COMBO=true;
2121
fi
2222

0 commit comments

Comments
 (0)