summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-01-26 13:33:57 +0100
committerThomas Haller <thaller@redhat.com>2023-01-30 08:18:45 +0100
commit67da2b8e429beaa003c48b196348786722da3fb9 (patch)
tree4602bd7594547cd628fd17f2e037335c6da64e6f
parent14b1a7ba300a6b52651b2217e835375b91d66602 (diff)
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')
-rwxr-xr-x.gitlab-ci/run-test.sh7
1 files 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