ci: travis: bring back default and wayland builds

Summary:
With some recent changes we only had builds running after a push which
did not qualify for a make check / ninja test run. Mostly due to problems
with the tests and specific config options. Bring back a default build
which will also run the unit tests un every push.

Also adding back a dedicated wayland build due to conflicts of gl
versions with the all options enabled build.

Fixes T7545

Reviewers: bu5hm4n, zmike

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7545

Differential Revision: https://phab.enlightenment.org/D7727
This commit is contained in:
Stefan Schmidt 2019-01-23 09:13:27 -05:00 committed by Mike Blumenkrantz
parent d6c207772f
commit cea392390f
2 changed files with 26 additions and 0 deletions

View File

@ -25,6 +25,10 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
OPTS="$OPTS $DISABLED_LINUX_COPTS"
fi
if [ "$1" = "wayland" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
fi
if [ "$1" = "release-ready" ]; then
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
fi
@ -95,6 +99,10 @@ else
OPTS="$OPTS $DISABLED_LINUX_COPTS"
fi
if [ "$1" = "wayland" ]; then
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
fi
if [ "$1" = "release-ready" ]; then
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
fi

View File

@ -32,6 +32,14 @@ jobs:
- os: linux
- DISTRO=Fedora29
- CI_BUILD_TYPE=options-disabled
- env:
- os: linux
- DISTRO=Fedora29
- CI_BUILD_TYPE=wayland
- env:
- os: linux
- DISTRO=Fedora29
- CI_BUILD_TYPE=default
- env:
- os: linux
- DISTRO=Fedora29
@ -42,6 +50,16 @@ jobs:
- DISTRO=Fedora29
- CI_BUILD_TYPE=options-disabled
- BUILDSYSTEM=ninja
- env:
- os: linux
- DISTRO=Fedora29
- CI_BUILD_TYPE=wayland
- BUILDSYSTEM=ninja
- env:
- os: linux
- DISTRO=Fedora29
- CI_BUILD_TYPE=default
- BUILDSYSTEM=ninja
- if: type = cron
env:
- os: linux