From dc588c951ca374326b7f6178259e1f81777d9f57 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Jan 2023 13:33:57 +0100 Subject: [PATCH] gitlab-ci: fix test script to abort on failing first test Fixes: 89cfd34ae0f5 ('gitlab-ci: extend run-test.sh script to manually select certain build steps to run') (cherry picked from commit 67da2b8e429beaa003c48b196348786722da3fb9) --- .gitlab-ci/run-test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/run-test.sh b/.gitlab-ci/run-test.sh index c8fe8016f0..d991010dc1 100755 --- a/.gitlab-ci/run-test.sh +++ b/.gitlab-ci/run-test.sh @@ -64,8 +64,11 @@ check_run_clean() { return 0 } -check_run_clean 1 && BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh \ - && mv build/INST/share/gtk-doc/html "$ARTIFACT_DIR/docs-html" +if check_run_clean 1 ; then + BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh + mv build/INST/share/gtk-doc/html "$ARTIFACT_DIR/docs-html" +fi + check_run_clean 2 && BUILD_TYPE=meson CC=gcc WITH_DOCS=1 WITH_VALGRIND=1 contrib/scripts/nm-ci-run.sh check_run_clean 3 && BUILD_TYPE=autotools CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh check_run_clean 4 && BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh