From: Michał Kępień <michal@isc.org>
Date: Fri, 29 Mar 2024 07:27:49 +0000 (+0100)
Subject: Extract CHANGES checks to a separate GitLab CI job
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=175b4af118b74ef78423515cd8d6517752f9f75c;p=thirdparty%2Fbind9.git

Extract CHANGES checks to a separate GitLab CI job

Checking the contents of the CHANGES file currently requires invoking
multiple shell scripts.  These invocations are conflated with those for
other test scripts in the "misc" GitLab CI job.  Extract the commands
checking the contents of the CHANGES file to a separate GitLab CI job,
"changes", to improve readability.  Remove similar checks for the
CHANGES.SE file altogether as they are only relevant for BIND -S and
therefore should not be present in an open source branch.

(cherry picked from commit 1335e139f28e1f0b448fd6f8d134228eb12efa98)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d59690a809..a13dbf0b386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -370,15 +370,6 @@ misc:
   script:
     - sh util/check-ans-prereq.sh
     - sh util/checklibs.sh > checklibs.out
-    - sh util/tabify-changes < CHANGES > CHANGES.tmp
-    - diff -urNap CHANGES CHANGES.tmp
-    - perl util/check-changes CHANGES
-    - sh util/check-line-length.sh 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
-    - test ! -f CHANGES.SE || sh util/check-line-length.sh CHANGES.SE
-    - rm CHANGES.tmp
     - xmllint --noout --nonet `git ls-files '*.xml' '*.docbook'`
     - sh util/xmllint-html.sh
     - sh util/check-win32util-configure
@@ -391,6 +382,16 @@ misc:
     expire_in: "1 day"
     when: on_failure
 
+changes:
+  <<: *precheck_job
+  script:
+    - sh util/tabify-changes < CHANGES > CHANGES.tmp
+    - diff -urNap CHANGES CHANGES.tmp
+    - perl util/check-changes CHANGES
+    - sh util/check-line-length.sh CHANGES
+    - rm CHANGES.tmp
+  needs: []
+
 coccinelle:
   <<: *precheck_job
   needs: []