Skip to content

Commit 5071624

Browse files
committed
releng/tag-release.sh: fix missing changelog detection
switching to sphinx means a new header level is used for releases in the changelog. Also, the initial header was causing a premature exit
1 parent 4be5441 commit 5071624

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

releng/tag-release.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,21 @@ trap "rm -f ${relnotes}" 0
8282
awk < docs/CHANGELOG.md > "${relnotes}" '
8383
BEGIN{ hdr=0; }
8484
85-
/^# /{
85+
/^## /{
8686
if (hdr) exit 0;
8787
hdr=1;
88-
sub(/^# /, "", $0);
88+
sub(/^## /, "", $0);
8989
sub(/ \(.*\)$/, "", $0);
9090
}
9191
9292
{
93-
if (hdr < 1) exit 1;
93+
if (hdr < 1) next;
9494
print;
9595
}'
9696

9797
# Make sure release notes refer to this version
9898
if ! (head -n 1 "${relnotes}" | grep -q "ZFSBootMenu ${tag}\b"); then
99-
error "ERROR: Add '# ZFSBootMenu ${tag}' header to docs/CHANGELOG.md"
99+
error "ERROR: Add '## ZFSBootMenu ${tag}' header to docs/CHANGELOG.md"
100100
fi
101101

102102
# Update version in generate-zbm

0 commit comments

Comments
 (0)