diff options
| author | Stefan Schmidt <s.schmidt@samsung.com> | 2018-11-19 14:22:10 +0100 |
|---|---|---|
| committer | Stefan Schmidt <s.schmidt@samsung.com> | 2018-11-23 14:20:25 +0100 |
| commit | defded25ebe6d16a675ee968f8fc0f785310ccdf (patch) | |
| tree | b66f62503e57fc2650b385176a8e89d8b63b1aeb /.travis.yml | |
| parent | c8e0a1d2e2eaa5b8369eeb34a38b3b343788703f (diff) | |
| download | efl-defded25ebe6d16a675ee968f8fc0f785310ccdf.tar.gz | |
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.yml | 8 |
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: - env: - os: linux - DISTRO=Fedora28 - - CI_BUILD_TYPE=wayland + - CI_BUILD_TYPE=options-enabled - env: - os: linux - DISTRO=Fedora28 - - CI_BUILD_TYPE=misc - - env: - - os: linux - - DISTRO=Fedora28 - - CI_BUILD_TYPE=misc-disabled + - CI_BUILD_TYPE=options-disabled - env: - os: linux - DISTRO=Fedora28 |