From cea392390f63cda5372f3c4803317a4be04407bb Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <s.schmidt@samsung.com>
Date: Wed, 23 Jan 2019 09:13:27 -0500
Subject: [PATCH] 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
---
 .ci/ci-configure.sh |  8 ++++++++
 .travis.yml         | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)

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
       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
diff --git a/.travis.yml b/.travis.yml
index b59462845d..d5d8b06375 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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