From: Nicki Křížek <nicki@isc.org>
Date: Tue, 24 Jun 2025 14:35:56 +0000 (+0200)
Subject: Add newline for changelog CI job
X-Git-Tag: v9.20.11~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01f20420b28665ffad2df40a3a72087fbf751f39;p=thirdparty%2Fbind9.git

Add newline for changelog CI job

In case the changelog file doesn't have an empty line at the end of the
file, the job may fail with the following error:

WARNING: Bullet list ends without a blank line; unexpected unindent.

This typically happens in MRs targeting the -S edition, as those
changelogs usually don't have an empty newline. This change ensures the
changelog job can pass and verify the title/desc contents even in those
cases.

(cherry picked from commit ebf155ecc82fbf20576ce1cf8e6c9521430b4c66)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81e2e6a7d5e..2423253d80a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -731,7 +731,9 @@ changelog:
     - sed -i 's/^Draft:\s*//' commitmsg
     - echo -e "$CI_MERGE_REQUEST_DESCRIPTION" >> commitmsg
     - git commit --allow-empty -F commitmsg
-    - ./contrib/gitchangelog/gitchangelog.py HEAD^..HEAD >> $(ls doc/changelog/changelog-9.* | sort --version-sort | tail -n 1)
+    - export CHANGELOG=$(ls doc/changelog/changelog-9.* | sort --version-sort | tail -n 1)
+    - printf "\n" >> $CHANGELOG
+    - ./contrib/gitchangelog/gitchangelog.py HEAD^..HEAD >> $CHANGELOG
   after_script:
     - git diff
   needs: