summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-01-23 09:13:27 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-01-23 09:13:27 -0500
commitcea392390f63cda5372f3c4803317a4be04407bb (patch)
treed3a13ad0baa66be9df85f5ac42f582d1dda11ee5
parentd6c207772f5297fa39ae5a5d400f00c66b0fd2dc (diff)
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
-rwxr-xr-x.ci/ci-configure.sh8
-rw-r--r--.travis.yml18
2 files changed, 26 insertions, 0 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 4a2211ba09..1bd8d91068 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -25,6 +25,10 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
25 OPTS="$OPTS $DISABLED_LINUX_COPTS" 25 OPTS="$OPTS $DISABLED_LINUX_COPTS"
26 fi 26 fi
27 27
28 if [ "$1" = "wayland" ]; then
29 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
30 fi
31
28 if [ "$1" = "release-ready" ]; then 32 if [ "$1" = "release-ready" ]; then
29 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 33 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
30 fi 34 fi
@@ -95,6 +99,10 @@ else
95 OPTS="$OPTS $DISABLED_LINUX_COPTS" 99 OPTS="$OPTS $DISABLED_LINUX_COPTS"
96 fi 100 fi
97 101
102 if [ "$1" = "wayland" ]; then
103 OPTS="$OPTS $WAYLAND_LINUX_COPTS"
104 fi
105
98 if [ "$1" = "release-ready" ]; then 106 if [ "$1" = "release-ready" ]; then
99 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 107 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
100 fi 108 fi
diff --git a/.travis.yml b/.travis.yml
index b59462845d..d5d8b06375 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,14 @@ jobs:
35 - env: 35 - env:
36 - os: linux 36 - os: linux
37 - DISTRO=Fedora29 37 - DISTRO=Fedora29
38 - CI_BUILD_TYPE=wayland
39 - env:
40 - os: linux
41 - DISTRO=Fedora29
42 - CI_BUILD_TYPE=default
43 - env:
44 - os: linux
45 - DISTRO=Fedora29
38 - CI_BUILD_TYPE=options-enabled 46 - CI_BUILD_TYPE=options-enabled
39 - BUILDSYSTEM=ninja 47 - BUILDSYSTEM=ninja
40 - env: 48 - env:
@@ -42,6 +50,16 @@ jobs:
42 - DISTRO=Fedora29 50 - DISTRO=Fedora29
43 - CI_BUILD_TYPE=options-disabled 51 - CI_BUILD_TYPE=options-disabled
44 - BUILDSYSTEM=ninja 52 - BUILDSYSTEM=ninja
53 - env:
54 - os: linux
55 - DISTRO=Fedora29
56 - CI_BUILD_TYPE=wayland
57 - BUILDSYSTEM=ninja
58 - env:
59 - os: linux
60 - DISTRO=Fedora29
61 - CI_BUILD_TYPE=default
62 - BUILDSYSTEM=ninja
45 - if: type = cron 63 - if: type = cron
46 env: 64 env:
47 - os: linux 65 - os: linux