Add 2 OSX versions

This commit is contained in:
cytopia 2016-12-26 15:21:38 +01:00
parent bfa7bd4635
commit efe1e7b926
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2

View File

@ -1,7 +1,6 @@
language: python language: python
sudo: required #python:
python: # - 2.7
- 2.7
### ###
@ -12,6 +11,28 @@ os:
- osx - 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 ### Add services
### ###
@ -23,7 +44,6 @@ services:
### Global variables ### Global variables
### ###
env: env:
global:
global: global:
- DEVILBOX_PHP_VERSION="$( grep -Eo 'image:.*PHP.*:.*' docker-compose.yml | sed 's/.*:.*://g' )" - 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' )" - DEVILBOX_HTTPD_VERSION="$( grep -Eo 'image:.*HTTPD.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
@ -39,6 +59,7 @@ before_install:
- docker-compose version - docker-compose version
- whoami - whoami
- groups - groups
- uname -a
### ###