From: Ondřej Surý <ondrej@isc.org>
Date: Mon, 24 Aug 2020 12:40:39 +0000 (+0200)
Subject: Make sure the maintainer files are clean after rebuild
X-Git-Tag: v9.17.5~36^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=586415fea2322e4f06931121de4bbd6f7c4f9ef2;p=thirdparty%2Fbind9.git

Make sure the maintainer files are clean after rebuild

When updating source files, we might forget to update pre-generated
files (generated by sphinx-build and cfg_gen) and then the extra changes
would get included in the random merge request.

This commit updates the tarball-create job to enable the maintainer
mode, then clean all maintainer files (`make maintainer-clean`) rebuild
all the file from scratch and compare the result which must be a clean
git directory.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60f9561efa7..8f36a7911b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -476,8 +476,12 @@ tarball-create:
   <<: *base_image
   <<: *default_triggering_rules
   script:
-    - *configure
+    - ./configure --enable-maintainer-mode
+    - make maintainer-clean
+    - autoreconf -fi
+    - ./configure --enable-maintainer-mode
     - make -j${BUILD_PARALLEL_JOBS:-1} all V=1
+    - if test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi
     - make -j${BUILD_PARALLEL_JOBS:-1} dist V=1
   artifacts:
     paths: