From 586415fea2322e4f06931121de4bbd6f7c4f9ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 24 Aug 2020 14:40:39 +0200 Subject: [PATCH 1/2] 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. --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60f9561efa..8f36a7911b 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: From ca487a5db0869ed7c51c7939230ecba54365c6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 24 Aug 2020 14:32:02 +0200 Subject: [PATCH 2/2] Sync the pregenerated files with their source counterparts --- doc/man/dnssec-importkey.1in | 2 +- doc/man/tsig-keygen.8in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/man/dnssec-importkey.1in b/doc/man/dnssec-importkey.1in index 174c25c2a3..619e5edade 100644 --- a/doc/man/dnssec-importkey.1in +++ b/doc/man/dnssec-importkey.1in @@ -39,7 +39,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .sp \fBdnssec\-importkey\fP reads a public DNSKEY record and generates a pair of .key/.private files. The DNSKEY record may be read from an existing -\&.key file, in which case a corresponding .private file is +.key file, in which case a corresponding .private file is generated, or it may be read from any other file or from the standard input, in which case both .key and .private files are generated. .sp diff --git a/doc/man/tsig-keygen.8in b/doc/man/tsig-keygen.8in index 4023cf146d..6af3f9b76e 100644 --- a/doc/man/tsig-keygen.8in +++ b/doc/man/tsig-keygen.8in @@ -32,7 +32,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .. .SH SYNOPSIS .sp -\fBtsig\-keygen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-r\fP randomfile] [\fB\-s\fP name] +\fBtsig\-keygen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-r\fP randomfile] [name] .sp \fBddns\-confgen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-k\fP keyname] [\fB\-q\fP] [\fB\-r\fP randomfile] [\fB\-s\fP name] [\fB\-z\fP zone] .SH DESCRIPTION