forked from enlightenment/efl
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:
parent
d6c207772f
commit
cea392390f
|
@ -25,6 +25,10 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
|
||||||
OPTS="$OPTS $DISABLED_LINUX_COPTS"
|
OPTS="$OPTS $DISABLED_LINUX_COPTS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$1" = "wayland" ]; then
|
||||||
|
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$1" = "release-ready" ]; then
|
if [ "$1" = "release-ready" ]; then
|
||||||
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
|
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
|
||||||
fi
|
fi
|
||||||
|
@ -95,6 +99,10 @@ else
|
||||||
OPTS="$OPTS $DISABLED_LINUX_COPTS"
|
OPTS="$OPTS $DISABLED_LINUX_COPTS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$1" = "wayland" ]; then
|
||||||
|
OPTS="$OPTS $WAYLAND_LINUX_COPTS"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$1" = "release-ready" ]; then
|
if [ "$1" = "release-ready" ]; then
|
||||||
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
|
OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
|
||||||
fi
|
fi
|
||||||
|
|
18
.travis.yml
18
.travis.yml
|
@ -32,6 +32,14 @@ jobs:
|
||||||
- os: linux
|
- os: linux
|
||||||
- DISTRO=Fedora29
|
- DISTRO=Fedora29
|
||||||
- CI_BUILD_TYPE=options-disabled
|
- CI_BUILD_TYPE=options-disabled
|
||||||
|
- env:
|
||||||
|
- os: linux
|
||||||
|
- DISTRO=Fedora29
|
||||||
|
- CI_BUILD_TYPE=wayland
|
||||||
|
- env:
|
||||||
|
- os: linux
|
||||||
|
- DISTRO=Fedora29
|
||||||
|
- CI_BUILD_TYPE=default
|
||||||
- env:
|
- env:
|
||||||
- os: linux
|
- os: linux
|
||||||
- DISTRO=Fedora29
|
- DISTRO=Fedora29
|
||||||
|
@ -42,6 +50,16 @@ jobs:
|
||||||
- DISTRO=Fedora29
|
- DISTRO=Fedora29
|
||||||
- CI_BUILD_TYPE=options-disabled
|
- CI_BUILD_TYPE=options-disabled
|
||||||
- BUILDSYSTEM=ninja
|
- 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
|
- if: type = cron
|
||||||
env:
|
env:
|
||||||
- os: linux
|
- os: linux
|
||||||
|
|
Loading…
Reference in New Issue