8000 Merge pull request #156 from SethTisue/travis-openjdk6 · sstucki/scala-parser-combinators@4719736 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4719736

Browse files
SethTisueSethTisue
authored
Merge pull request scala#156 from SethTisue/travis-openjdk6
fix Travis-CI to use openjdk6
2 parents a5c815d + 6c7679b commit 4719736

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

‎.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# disables sudo
2-
# this allows for faster builds, using travis's docker-based build infra
3-
sudo: false
1+
# needed to work around https://github.com/travis-ci/travis-ci/issues/9713
2+
sudo: true
43

54
language: scala
65

@@ -21,7 +20,12 @@ env:
2120
# SONA_PASS
2221
- secure: "OIVtcj7AHZr8Grpf03ZmZsygcADewiYIvSnRwLYCx+5AqOzs39EZ68DsIOxi7wEXVUbVj5RvLXpKzLX3iN+UszLOQRoFPFQyyn+3Y50f8T2aRxdZtInzXn0sCVTj4Hhd/zbKl1W+2Nh3Sqazab7tFoQVzEyYqhcPeiNRMF7h+aY="
2322

24-
script: admin/build.sh
23+
script:
24+
- echo $JAVA_HOME
25+
# work around https://github.com/travis-ci/travis-ci/issues/9713
26+
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
27+
- java -version
28+
- admin/build.sh
2529

2630
addons:
2731
apt:

0 commit comments

Comments
 (0)
0