From efe1e7b9263b17e4c05078c336b8704dc304ea36 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 26 Dec 2016 15:21:38 +0100 Subject: [PATCH] Add 2 OSX versions --- .travis.yml | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b05567a3..ecc7d006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python -sudo: required -python: - - 2.7 +#python: +# - 2.7 ### @@ -12,6 +11,28 @@ os: - osx +### +### Configure OS +### +matrix: + include: + - os: linux + dist: trusty + sudo: required + python: 3.2 + env: TOXENV=py32 + # OSX 10.11 + - os: osx + osx_image: xcode7.3 + language: generic + env: TOXENV=py32 + # OSX 10.12 + - os: osx + osx_image: xcode8.2 + language: generic + env: TOXENV=py32 + + ### ### Add services ### @@ -23,7 +44,6 @@ services: ### Global variables ### env: - global: global: - DEVILBOX_PHP_VERSION="$( grep -Eo 'image:.*PHP.*:.*' docker-compose.yml | sed 's/.*:.*://g' )" - DEVILBOX_HTTPD_VERSION="$( grep -Eo 'image:.*HTTPD.*:.*' docker-compose.yml | sed 's/.*:.*://g' )" @@ -39,6 +59,7 @@ before_install: - docker-compose version - whoami - groups + - uname -a ###