summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-06-19 09:49:04 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-26 16:22:43 +0200
commit3d6f15545934b8f74a932d7a6e262ae67aed7c20 (patch)
treed7f7ede011df3b71bf4ef16e9db00eeb9ad8087e
parente962e6be4f91ea78faed1fb7335f68485bd7f1a3 (diff)
ci: move release-ready to default build and enable tests+install on itdevs/stefan/travis-no-default
with meson, the only difference between our 'default' and 'release-ready' builds is that the release build uses a different build type which sets some compile/build flags. these should not provide any differing coverage over a regular build, so we can reduce our job matrix by one here Differential Revision: https://phab.enlightenment.org/D9123
-rwxr-xr-x.ci/ci-make-check.sh3
-rwxr-xr-x.ci/ci-make-install.sh3
-rw-r--r--.travis.yml3
3 files changed, 0 insertions, 9 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 36f1f2de58..656de53400 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -1,9 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3. .ci/travis.sh 3. .ci/travis.sh
4if [ "$1" = "release-ready" ] ; then
5 exit 0
6fi
7 4
8if [ "$1" = "mingw" ] ; then 5if [ "$1" = "mingw" ] ; then
9 exit 0 6 exit 0
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index 74769896c3..49c9348851 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -2,9 +2,6 @@
2 2
3set -e 3set -e
4. .ci/travis.sh 4. .ci/travis.sh
5if [ "$1" = "release-ready" ] ; then
6 exit 0
7fi
8if [ "$1" = "coverity" ] ; then 5if [ "$1" = "coverity" ] ; then
9 exit 0 6 exit 0
10fi 7fi
diff --git a/.travis.yml b/.travis.yml
index 749f55d6f9..bb7d39cb08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,9 +54,6 @@ jobs:
54 - os: linux 54 - os: linux
55 env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland 55 env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland
56 - os: linux 56 - os: linux
57 env: DISTRO=Fedora29 CI_BUILD_TYPE=default
58 - os: linux
59 if: type = cron
60 env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready 57 env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready
61 - os: linux 58 - os: linux
62 if: type = cron 59 if: type = cron