Skip to content

Commit 3871786

Browse files
authored
Merge pull request #231 from eed3si9n/wip/adoptopenjdk
Use AdoptOpenJDK JDK 8 and 11
2 parents f4436c4 + 800808b commit 3871786

File tree

1 file changed

+33
-23
lines changed

1 file changed

+33
-23
lines changed

.travis.yml

+33-23
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ scala:
44
- 2.11.12
55
- 2.12.8
66
- 2.13.0
7-
jdk:
8-
- openjdk8
9-
- openjdk11
7+
108
env:
119
global:
1210

@@ -17,43 +15,55 @@ env:
1715
# SONA_PASS
1816
- secure: "m0Fw/eH7RXJJoBTfqV6CMd7kaIN2pRPnQPNXJGb546UjqYAlYTkfjvVrWpsgpisRBptI1FEHn24yGbgAHjIes/4un/O62K66I0BffL8PbdeHeNcDjSrTesKEqage2mQfGOiqccVsmkgiKeXNYL8tPZRmPQQ3XZ97mS1SXWlqAJSMW6HfNnvqW14Gdb/snR6I8lQ2o5tRnLerWPnI96pp+xjZca2lD4XDvH2wLJXXLmYY61e23ZYzZMepxBxhGa7js3YTYzCWNrOfBLjFJ5nwRxbjR0WMuz5z5Gdy715WtguKS4Fffd/GJHycLROBU9LCAQDMTxMFvqzFqVFpfq0BuTmmkXFXj+a7dO+ABG0RfoDfoMjn7pHwyHNCZyMMuR1HCjMkbGFwC+Zme2UAYNivtcsuWWeMuypwjyqjfFfNns4FHJ0SXFtC/6+OJkAuUdbEJKReYWKWEsP5SnCH/8PLlc+uUl3tjQkFLc1sOAyx9cTWyBErwuJXhgTrjT9AWvO+fvhcm8z/p5+aaF/U9GIrzPqziX4hGjzc/WC+rsFJSiBDlFQl7br+m8WWs7/wuXqPGXmhf0BNQViDi7fZndDHcY3p3T0An05d/IMKjCUrgLDlJi6VYs9XN7S8ay6MH+XTwIsJGSxtGjfEO4rHGIjtR2GRr8TqdNfnpsI3ucbia1Y="
1917
matrix:
20-
- SCALAJS_VERSION=
21-
- SCALAJS_VERSION=0.6.28
22-
- SCALAJS_VERSION=1.0.0-M8
18+
- SCALAJS_VERSION= ADOPTOPENJDK=8
19+
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
20+
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
21+
- SCALAJS_VERSION= ADOPTOPENJDK=11
22+
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=11
23+
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=11
2324

2425
matrix:
2526

2627
include:
2728

2829
# run migration test
29-
- jdk: openjdk8
30-
scala: 2.12.8
31-
env: TEST_SCALAFIX=true
30+
- scala: 2.12.8
31+
env: TEST_SCALAFIX=true ADOPTOPENJDK=11
3232

3333
# run binary compatibility test
34-
- jdk: openjdk8
35-
scala: 2.12.8
36-
env: TEST_BINARY_COMPAT=true
34+
- scala: 2.12.8
35+
env: TEST_BINARY_COMPAT=true ADOPTOPENJDK=11
3736

3837
# run scalafmt
39-
- jdk: openjdk8
40-
scala: 2.12.8
41-
env: TEST_SCALAFMT=true
38+
- scala: 2.12.8
39+
env: TEST_SCALAFMT=true ADOPTOPENJDK=11
40+
41+
before_install:
42+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
43+
- "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
44+
- curl -sL https://get.sdkman.io | bash
45+
- echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
46+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
47+
48+
install:
49+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
50+
- unset JAVA_HOME
51+
- java -Xmx32m -version
52+
- javac -J-Xmx32m -version
4253

4354
before_script:
4455
- admin/checkCLA.sh
4556

46-
script:
47-
- java -version
48-
- sbt ci
57+
script: sbt ci
4958

5059
cache:
5160
directories:
52-
- "$HOME/.sbt/preloaded"
53-
- "$HOME/.sbt/1.0/dependency"
54-
- "$HOME/.sbt/boot/scala*"
55-
- "$HOME/.sbt/launchers"
56-
- "$HOME/.ivy2/cache"
61+
- "$HOME/.sbt/preloaded"
62+
- "$HOME/.sbt/1.0/dependency"
63+
- "$HOME/.sbt/boot/scala*"
64+
- "$HOME/.sbt/launchers"
65+
- "$HOME/.ivy2/cache"
66+
- "$HOME/.sdkman"
5767

5868
before_cache:
5969
- du -h -d 1 $HOME/.ivy2/cache

0 commit comments

Comments
 (0)