From eb5ae97083434fe15f25d47c9524fd319a623b88 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 12 Dec 2023 10:50:49 +0100 Subject: [PATCH] Do not consider bin/named/bind9.xsl.h in docs job check The BIND 9.16 build system occasionally produces a bin/named/bind9.xsl.h file that differs slightly from the version in the bind-9.16 branch due to a race condition. This poses an issue for the "docs" CI job, which executes the "maintainer-clean" make target, regenerates the bin/named/bind9.xsl.h file, and checks for differences with the committed file. The race condition causes discrepancies in this check. Since this problem doesn't occur in BIND 9.18+, we can hide it by adding bin/named/bind9.xsl.h to the list of files excluded from the check. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5849d29c6f..7acc343558 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -583,7 +583,7 @@ docs: - *configure - make -j${BUILD_PARALLEL_JOBS:-1} all V=1 - make -j${BUILD_PARALLEL_JOBS:-1} doc V=1 - - if test "$(git status --porcelain | grep -Ev '\?\?' | grep -v -F -e aclocal.m4 -e configure -e ltmain.sh -e m4/ | wc -l)" -gt "0"; then git status --short; exit 1; fi + - if test "$(git status --porcelain | grep -Ev '\?\?' | grep -v -F -e aclocal.m4 -e configure -e ltmain.sh -e bin/named/bind9.xsl.h -e m4/ | wc -l)" -gt "0"; then git status --short; exit 1; fi - find doc/man/ -maxdepth 1 -name "*.[0-9]" -exec mandoc -T lint "{}" \; | ( ! grep -v -e "skipping paragraph macro. sp after" -e "unknown font, skipping request. ft C" -e "input text line longer than 80 bytes" ) artifacts: paths: