summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-12-12 11:05:16 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-12-18 09:16:03 +0100
commit0ed64caa360db326d6dae041701e92633498bec6 (patch)
treedb9d85e6f8695caf140ac704a86c8ac16443c1ea
parentaf040650675fdd4c8bb56e6ef0390d32e21d88fd (diff)
ci: refactor the early exit on specific build jobs
Should be no functional change only making all early checks a bit shorter. Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com> Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10866
-rwxr-xr-x.ci/ci-build-test.sh14
-rwxr-xr-x.ci/ci-make-check.sh16
-rwxr-xr-x.ci/ci-make-distcheck.sh2
-rwxr-xr-x.ci/ci-make-install.sh7
-rwxr-xr-x.ci/ci-make.sh2
5 files changed, 14 insertions, 27 deletions
diff --git a/.ci/ci-build-test.sh b/.ci/ci-build-test.sh
index 67b39dec5e..05b753e38b 100755
--- a/.ci/ci-build-test.sh
+++ b/.ci/ci-build-test.sh
@@ -2,17 +2,13 @@
2 2
3set -e 3set -e
4. .ci/travis.sh 4. .ci/travis.sh
5
6if [ "$1" = "coverity" ] || [ "$1" = "mingw" ] || [ "$1" = "release-ready" ] ; then
7 exit 0
8fi
9
5travis_fold compile_test compile_test 10travis_fold compile_test compile_test
6if [ "$DISTRO" != "" ] ; then 11if [ "$DISTRO" != "" ] ; then
7 if [ "$1" = "coverity" ] ; then
8 exit 0
9 fi
10 if [ "$1" = "mingw" ] ; then
11 exit 0
12 fi
13 if [ "$1" = "release-ready" ] ; then
14 exit 0
15 fi
16 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-example.sh 12 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-example.sh
17else 13else
18 exit 0 14 exit 0
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 682d613544..44f5f2bf90 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -1,25 +1,13 @@
1#!/bin/sh 1#!/bin/sh
2 2
3set -e
3. .ci/travis.sh 4. .ci/travis.sh
4if [ "$1" = "release-ready" ] ; then
5 exit 0
6fi
7
8if [ "$1" = "mingw" ] ; then
9 exit 0
10fi
11 5
12if [ "$1" = "coverity" ] ; then 6if [ "$1" = "release-ready" ] || [ "$1" = "mingw" ] || [ "$1" = "coverity" ] || [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ]; then
13 exit 0
14fi
15
16#T7151
17if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
18 exit 0 7 exit 0
19fi 8fi
20 9
21NUM_TRIES=5 10NUM_TRIES=5
22
23travis_fold check "ninja test" 11travis_fold check "ninja test"
24if [ "$DISTRO" != "" ] ; then 12if [ "$DISTRO" != "" ] ; then
25 for tries in $(seq 1 ${NUM_TRIES}); do 13 for tries in $(seq 1 ${NUM_TRIES}); do
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 637450b64d..22f441c14b 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -2,9 +2,11 @@
2 2
3set -e 3set -e
4. .ci/travis.sh 4. .ci/travis.sh
5
5if [ "$1" != "release-ready" ] ; then 6if [ "$1" != "release-ready" ] ; then
6 exit 0 7 exit 0
7fi 8fi
9
8travis_fold distcheck "ninja dist" 10travis_fold distcheck "ninja dist"
9if [ "$DISTRO" != "" ] ; then 11if [ "$DISTRO" != "" ] ; then
10 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 12 docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index 08bf1db204..157f1a2401 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -2,12 +2,11 @@
2 2
3set -e 3set -e
4. .ci/travis.sh 4. .ci/travis.sh
5if [ "$1" = "release-ready" ] ; then 5
6 exit 0 6if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then
7fi
8if [ "$1" = "coverity" ] ; then
9 exit 0 7 exit 0
10fi 8fi
9
11travis_fold install "ninja install" 10travis_fold install "ninja install"
12if [ "$1" = "asan" ]; then 11if [ "$1" = "asan" ]; then
13 docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build install 12 docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build install
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index c8d7332f05..167e2369cb 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -2,9 +2,11 @@
2 2
3set -e 3set -e
4. .ci/travis.sh 4. .ci/travis.sh
5
5if [ "$1" = "release-ready" ] ; then 6if [ "$1" = "release-ready" ] ; then
6 exit 0 7 exit 0
7fi 8fi
9
8travis_fold ninja ninja 10travis_fold ninja ninja
9if [ "$1" = "asan" ]; then 11if [ "$1" = "asan" ]; then
10 docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build 12 docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build