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-runtime-ruby.git
The following commit(s) were added to refs/heads/master by this push:
new b82f89f travis - dist:xenial and language:java (#37)
b82f89f is described below
commit b82f89f5cdd591b707302570a8ad4b5235a49d8c
Author: David Grove <[email protected]>
AuthorDate: Sun Dec 1 15:18:27 2019 -0500
travis - dist:xenial and language:java (#37)
* travis - dist:xenial and language:java
* xenial has good enough version of docker; don't need to do anything in
setup
* get docker-ce addon
---
.travis.yml | 14 ++++++++++----
tools/travis/setup.sh | 9 ---------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c573992..114e957 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,18 @@
#
sudo: required
-group: deprecated-2017Q3
-language: scala
-scala:
-- 2.12.7
+dist: xenial
+jdk: openjdk8
+language: java
+
services:
- docker
+# required to support multi-stage build
+addons:
+ apt:
+ packages:
+ - docker-ce
+
before_install:
- "cat /etc/os-release"
- "./tools/travis/setup.sh"
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index cfdb4bf..6315f1a 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -18,15 +18,6 @@
set -e
-# upgrade docker
-sudo apt-get -y update
-sudo apt-get install -y apt-transport-https ca-certificates curl
software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64]
https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-sudo apt-get update -y
-sudo apt-get remove docker docker-engine
-sudo apt-get -y install docker-ce=17.06.2~ce-0~ubuntu
-
# Build script for Travis-CI.
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
