mirror of https://github.com/docker/compose.git
Merge pull request #2439 from solarce/sol-matrix-trusty-fix
Fixing matrix include so `os: linux` goes to trusty
This commit is contained in:
commit
83ddec8df7
|
@ -2,16 +2,14 @@ sudo: required
|
||||||
|
|
||||||
language: python
|
language: python
|
||||||
|
|
||||||
services:
|
|
||||||
- docker
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
- os: linux
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
- os: osx
|
- os: osx
|
||||||
language: generic
|
language: generic
|
||||||
|
|
||||||
|
|
||||||
install: ./script/travis/install
|
install: ./script/travis/install
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
|
Loading…
Reference in New Issue