diff options
| author | Stefan Schmidt <s.schmidt@samsung.com> | 2019-12-12 11:05:16 +0100 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-12-18 09:16:03 +0100 |
| commit | 0ed64caa360db326d6dae041701e92633498bec6 (patch) | |
| tree | db9d85e6f8695caf140ac704a86c8ac16443c1ea /.ci | |
| parent | af040650675fdd4c8bb56e6ef0390d32e21d88fd (diff) | |
| download | efl-0ed64caa360db326d6dae041701e92633498bec6.tar.gz | |
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
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/ci-build-test.sh | 14 | ||||
| -rwxr-xr-x | .ci/ci-make-check.sh | 16 | ||||
| -rwxr-xr-x | .ci/ci-make-distcheck.sh | 2 | ||||
| -rwxr-xr-x | .ci/ci-make-install.sh | 7 | ||||
| -rwxr-xr-x | .ci/ci-make.sh | 2 |
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 @@ set -e . .ci/travis.sh + +if [ "$1" = "coverity" ] || [ "$1" = "mingw" ] || [ "$1" = "release-ready" ] ; then + exit 0 +fi + travis_fold compile_test compile_test if [ "$DISTRO" != "" ] ; then - if [ "$1" = "coverity" ] ; then - exit 0 - fi - if [ "$1" = "mingw" ] ; then - exit 0 - fi - if [ "$1" = "release-ready" ] ; then - exit 0 - fi docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-example.sh else 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 @@ #!/bin/sh +set -e . .ci/travis.sh -if [ "$1" = "release-ready" ] ; then - exit 0 -fi - -if [ "$1" = "mingw" ] ; then - exit 0 -fi -if [ "$1" = "coverity" ] ; then - exit 0 -fi - -#T7151 -if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then +if [ "$1" = "release-ready" ] || [ "$1" = "mingw" ] || [ "$1" = "coverity" ] || [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ]; then exit 0 fi NUM_TRIES=5 - travis_fold check "ninja test" if [ "$DISTRO" != "" ] ; then 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 @@ set -e . .ci/travis.sh + if [ "$1" != "release-ready" ] ; then exit 0 fi + travis_fold distcheck "ninja dist" if [ "$DISTRO" != "" ] ; then 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 @@ set -e . .ci/travis.sh -if [ "$1" = "release-ready" ] ; then - exit 0 -fi -if [ "$1" = "coverity" ] ; then + +if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then exit 0 fi + travis_fold install "ninja install" if [ "$1" = "asan" ]; then 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 @@ set -e . .ci/travis.sh + if [ "$1" = "release-ready" ] ; then exit 0 fi + travis_fold ninja ninja if [ "$1" = "asan" ]; then 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 |