summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2018-11-19 14:22:10 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-11-23 14:20:25 +0100
commitdefded25ebe6d16a675ee968f8fc0f785310ccdf (patch)
treeb66f62503e57fc2650b385176a8e89d8b63b1aeb /.travis.yml
parentc8e0a1d2e2eaa5b8369eeb34a38b3b343788703f (diff)
travis: merge wayland build into misc and rename to options-enabled
The misc build already had most of the extra options enabled for the EFL build. Instead of wasting CPU cycles on a full seperate build for just wayland options we merge these two together. In the process we rename from misc (pretty vague) to options-enabled and options-disbaled. Due to the combination of options we need to disable sdl for now. It clashes with the OpenGL ES option we enable for wayland. Having build for the different GL flavours is something we should look into at some point. Patch is based on the patches from Marcel in D7253 and D7254 Differential Revision: https://phab.enlightenment.org/D7320
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 245225a3af..dd92528d0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,15 +23,11 @@ jobs:
23 - env: 23 - env:
24 - os: linux 24 - os: linux
25 - DISTRO=Fedora28 25 - DISTRO=Fedora28
26 - CI_BUILD_TYPE=wayland 26 - CI_BUILD_TYPE=options-enabled
27 - env: 27 - env:
28 - os: linux 28 - os: linux
29 - DISTRO=Fedora28 29 - DISTRO=Fedora28
30 - CI_BUILD_TYPE=misc 30 - CI_BUILD_TYPE=options-disabled
31 - env:
32 - os: linux
33 - DISTRO=Fedora28
34 - CI_BUILD_TYPE=misc-disabled
35 - env: 31 - env:
36 - os: linux 32 - os: linux
37 - DISTRO=Fedora28 33 - DISTRO=Fedora28