Skip to content

Commit 8f7fdc4

Browse files
committed
Use AdoptOpenJDK JDK 8 for testing
Ref scala/scala-dev#587
1 parent 1be284c commit 8f7fdc4

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

.travis.yml

+22-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
# GCE VMs have better performance (will be upgrading to premium VMs soon)
2-
sudo: required
3-
1+
dist: xenial
2+
group: stable
43
language: scala
5-
jdk: openjdk8
64

7-
cache:
8-
directories:
9-
- $HOME/.ivy2/cache
10-
- $HOME/.sbt
11-
- $HOME/.rvm/
5+
before_install:
6+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
7+
- "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
8+
- curl -sL https://get.sdkman.io | bash
9+
- echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
10+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
11+
12+
install:
13+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
14+
- java -Xmx32m -version
15+
- javac -J-Xmx32m -version
1216

1317
stages:
1418
- name: build
@@ -38,6 +42,7 @@ jobs:
3842

3943
# pull request validation (w/ mini-bootstrap)
4044
- stage: build
45+
name: "JDK 8 pr validation"
4146
if: type = pull_request
4247
script:
4348
- sbt -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
@@ -48,10 +53,8 @@ jobs:
4853
- stage: build
4954
language: ruby
5055
install:
51-
- rvm install 2.2
52-
- rvm use 2.2
53-
- rvm info
5456
- ruby -v
57+
- gem install bundler
5558
- bundler --version
5659
- bundle install
5760
script:
@@ -62,6 +65,7 @@ jobs:
6265

6366
env:
6467
global:
68+
- ADOPTOPENJDK=8
6569
- secure: "TuJOUtALynPd+MV1AuMeIpVb8BUBHr7Ul7FS48XhS2PyuTRpEBkSWybYcNg3AXyzmWDAuOjUxbaNMQBvP8vvehTbIYls5H5wTGKvj0D0TNVaPIXjF8bA8KyNat9xGNzhnWm2/2BMaWpKBJWRF7Jb+zHhijMYCJEbkMtoiE5R/mY=" # PRIV_KEY_SECRET, for scripts/travis-publish-spec.sh
6670
- secure: "T1fxtvLTxioyXJYiC/zVYdNYsBOt+0Piw+xE04rB1pzeKahm9+G2mISdcAyqv6/vze9eIJt6jNHHpKX32/Z3Cs1/Ruha4m3k+jblj3S0SbxV6ht2ieJXLT5WoUPFRrU68KXI8wqUadXpjxeJJV53qF2FC4lhfMUsw1IwwMhdaE8=" # PRIVATE_REPO_PASS
6771
- secure: "feE5A8mYNpkNQKVwCj3aXrwjVrJWh/4ENpRfFlr2HOD9ORk1GORD5Yq907WZd+dTkYK54Lh1gA+qHOCIDgJHbi9ZLU+kjzEjtYKF6lQy6Wb0LI8smTOnAA6IWVVYifiXw8d66MI2MKZb2jjGeIzy8Q00SZjLhEGjLyTeCIB88Ws=" # SONA_USER
@@ -73,6 +77,12 @@ before_cache:
7377
# Cleanup the cached directories to avoid unnecessary cache updates
7478
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
7579
- find $HOME/.sbt -name "*.lock" -print -delete
80+
cache:
81+
directories:
82+
- $HOME/.ivy2/cache
83+
- $HOME/.sbt
84+
- $HOME/.rvm/
85+
- $HOME/.sdkman
7686

7787
notifications:
7888
webhooks: https://scala-ci.typesafe.com/benchq/webhooks/travis

0 commit comments

Comments
 (0)