From 01f20420b28665ffad2df40a3a72087fbf751f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Tue, 24 Jun 2025 16:35:56 +0200 Subject: [PATCH] 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) --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81e2e6a7d5..2423253d80 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: