From: Mark Andrews Date: Thu, 16 Jan 2020 22:25:53 +0000 (+1100) Subject: check that CHANGES.SE entries are correctly ordered and that whitespace is correct X-Git-Tag: v9.14.11~43^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0605f1ee2e640be6376002e2745870c0e507d6d;p=thirdparty%2Fbind9.git check that CHANGES.SE entries are correctly ordered and that whitespace is correct (cherry picked from commit 05f2ba973f88cbca0ae8f866b6cf72fcaffb9e64) --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc0c46812c6..13347046937 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -362,8 +362,11 @@ misc:sid:amd64: - sh util/checklibs.sh > checklibs.out - sh util/tabify-changes < CHANGES > CHANGES.tmp - diff -urNap CHANGES CHANGES.tmp - - rm CHANGES.tmp - perl util/check-changes CHANGES + - test ! -f CHANGES.SE || sh util/tabify-changes < CHANGES.SE > CHANGES.tmp + - test ! -f CHANGES.SE || diff -urNap CHANGES.SE CHANGES.tmp + - test ! -f CHANGES.SE || perl util/check-changes master=0 CHANGES.SE + - rm CHANGES.tmp - perl -w util/merge_copyrights - diff -urNap util/copyrights util/newcopyrights - rm util/newcopyrights