Skip to content

Commit c73dae1

Browse files
dgrove-ossrabbah
authored andcommitted
travis - jdk: openjdk8 and don't re-install docker (#24)
1 parent 6ab68a7 commit c73dae1

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
sudo: required
1919
dist: xenial
20-
language: scala
21-
scala:
22-
- 2.12.7
20+
jdk: openjdk8
21+
language: java
2322
services:
2423
- docker
24+
2525
notifications:
2626
email: false
2727
webhooks:

tools/travis/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ export OPENWHISK_HOME=$WHISKDIR
3131
cd $UTILDIR
3232
scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
3333

34-
# Upgrade docker version
35-
curl -fsSL https://get.docker.com -o get-docker.sh
36-
sudo sh get-docker.sh
37-
docker version
38-
3934
# Upgrade dpkg avoid problems installing dotnet 3.0
4035
# https://github.com/travis-ci/travis-ci/issues/9361#issuecomment-408431262
4136
sudo apt-get install -y --force-yes -q -qq dpkg

0 commit comments

Comments
 (0)