summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2018-01-05 16:24:43 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2018-01-10 09:49:53 +0100
commit564e8987b9f0752b9d74265fd4fc25f0e7d82c9b (patch)
treeb3ff9f3ac5fb5c2a942e2e0b084d3b2114328ac4 /.travis.yml
parent823cc96ae97601958ee91b1b5e475bc6b6711693 (diff)
travis: add misc and wayland build options to build matrix
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index fff307fa3c..27140574e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ matrix:
12 include: 12 include:
13 - env: DISTRO=Ubuntu1710 13 - env: DISTRO=Ubuntu1710
14 - env: DISTRO=Fedora27 14 - env: DISTRO=Fedora27
15 - env: DISTRO=Fedora27 CI_BUILD_TYPE=wayland
16 - env: DISTRO=Fedora27 CI_BUILD_TYPE=misc
15 - env: DISTRO=Debian91 17 - env: DISTRO=Debian91
16 - env: DISTRO=Archlinux 18 - env: DISTRO=Archlinux
17 - os: osx 19 - os: osx
@@ -31,7 +33,7 @@ before_script:
31script: 33script:
32 - | 34 - |
33 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then 35 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
34 docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh 36 docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh $CI_BUILD_TYPE
35 fi 37 fi
36 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi 38 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi
37 39