You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2019/11/23 15:06:07 UTC
[openwhisk-apigateway] branch master updated: travis normalization
dist, language, jdk, docker install (#367)
This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-apigateway.git
The following commit(s) were added to refs/heads/master by this push:
new 5d419ed travis normalization dist, language, jdk, docker install (#367)
5d419ed is described below
commit 5d419ed91f3ff6d59123b1aeae14e46c85ad767d
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Sat Nov 23 10:06:00 2019 -0500
travis normalization dist, language, jdk, docker install (#367)
---
.travis.yml | 8 +++-----
tools/travis/setup.sh | 12 ------------
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8569fcc..20bb704 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,9 @@
# A Travis CI configuration file.
sudo: required
-
-language: scala
-scala:
- - 2.12.7
-
+dist: xenial
+jdk: openjdk8
+language: java
services:
- docker
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 8d6e599..8c63456 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -19,18 +19,6 @@
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
HOMEDIR="$SCRIPTDIR/../../.."
-sudo gpasswd -a travis docker
-sudo -E bash -c 'echo '\''DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --storage-driver=overlay --userns-remap=default"'\'' > /etc/default/docker'
-
-# Docker
-sudo apt-get -y update -qq
-sudo apt-get -o Dpkg::Options::="--force-confold" --force-yes -y install docker-engine=1.12.0-0~trusty
-sudo service docker restart
-echo "Docker Version:"
-docker version
-echo "Docker Info:"
-docker info
-
# jshint support
sudo apt-get -y install nodejs npm
sudo npm install -g jshint