From 52c689153414f5cf236d4947f2561ba9f90b5e4c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 9 Nov 2020 09:34:49 +0100 Subject: [PATCH] gitlab-ci: reorder jobs for checkpatch test All the steps of "checkpatch" test (except the last) check the current tree for consistency. Those checks must always pass. Only the last step calls the "checkpatch-feature-branch.sh". That script checks for common patterns, like avoiding g_assert() (in favor of other assertion types). That last check only checks the current patch, and there are many cases where the test is known to fail (because these are just heuristics). As such, the step that may fail should be called as last. --- .gitlab-ci.yml | 2 +- .gitlab-ci/ci.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e40d33ebbf..c0781f298e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -754,10 +754,10 @@ checkpatch: stage: test script: - date '+%Y%m%d-%H%M%S'; dnf install -y git black gettext /usr/bin/xargs which clang - - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh + - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh allow_failure: true pages: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 9f67dd7891..be4f651588 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -199,10 +199,10 @@ checkpatch: stage: test script: - date '+%Y%m%d-%H%M%S'; dnf install -y git black gettext /usr/bin/xargs which clang - - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh - date '+%Y%m%d-%H%M%S'; black --check . examples/python/gi/nm-wg-set - date '+%Y%m%d-%H%M%S'; git ls-files -z -- 'po/*.po' | xargs -0 -n1 msgfmt -vc - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-code-format.sh + - date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh allow_failure: true pages: