forked from heavy-duty/rig
The arming rule (#66) guards ONE heading — does the top section agree with VERSION? — and is silent about the rest of the file. The failure that lives there is an author adding an entry under `## Unreleased` who replaces the shipped heading below it instead of inserting above it. git merges the one-line edit cleanly, `changelog_armed()` stays green (correctly: the top section is still right), and the shipped release loses its section entirely. It surfaces a whole release later, when release.yml refuses to publish a section `changelog_section()` can no longer find by heading. "A heading disappeared" is a property of a DIFF, not of a tree, so this is its own script rather than a clause in the arming check — which is also driven from test/release.sh against constructed non-git VERSION + CHANGELOG pairs that could not express it. The rule needs no tuning: release headings are append-only, so SUPERSET is exact, and the ceremony's stamp passes by construction because `Unreleased` fails the version shape. Ported from heavy-duty/box#122, with box's second half intact: containment cannot catch a DUPLICATED heading, since the duplicate is head-side surplus and `comm -23` is blind to extras there — so uniqueness on HEAD is asserted alongside it. rig's symptom differs from box's and the comments say so: box's extractor re-arms on every `## ` line and ABSORBS what sits between the copies, while rig's `changelog_section()` has `if (found) exit` and TRUNCATES at the second copy, dropping the release's real body. Wired on pull requests only (on a push to main the merge base is HEAD, so the assert is vacuous), with CHANGELOG_MONOTONIC_STRICT=1 and fetch-depth: 0 so a checkout that cannot reach the base ref fails rather than skipping quietly forever. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
218 lines
9.7 KiB
Bash
218 lines
9.7 KiB
Bash
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
# changelog-monotonic.sh [<base-ref>] [<changelog>] — assert that no SHIPPED
|
|
# release heading was DELETED by this branch: the set of '^## X.Y.Z' headings
|
|
# on HEAD must be a SUPERSET of the set at the merge base.
|
|
#
|
|
# The failure it exists to catch (#98; ported from heavy-duty/box#122, which
|
|
# was caught in review of box#118) leaves no trace. An author adding an entry
|
|
# under '## Unreleased' REPLACES the line below it instead of inserting above
|
|
# it:
|
|
#
|
|
# -## 0.2.0 — 2026-07-19
|
|
# +## Unreleased
|
|
# +
|
|
# +### Fixed
|
|
# +
|
|
# +- **An entry**
|
|
#
|
|
# git merges that cleanly — it is a one-line edit inside a file nobody has
|
|
# touched concurrently — so there is no conflict and no signal. 0.2.0's whole
|
|
# body is now sitting under '## Unreleased', and 0.2.0 has no section at all.
|
|
#
|
|
# The arming rule is green on exactly that tree, correctly. changelog_armed()
|
|
# in test/release.sh asks only whether the TOP section agrees with VERSION,
|
|
# and deleting '## 0.2.0' leaves '## Unreleased' on top. It is not wrong, it
|
|
# is narrow — it guards ONE heading, the one a PR is about to write under.
|
|
# This guards the REST of the file, the part no single tree can be asked
|
|
# about at all, because "a heading disappeared" is not a property of a tree —
|
|
# it is a property of a DIFF.
|
|
#
|
|
# The damage surfaces at the next release, in changelog_section()
|
|
# (.github/scripts/release-lib.sh), which anchors on the heading:
|
|
#
|
|
# awk -v ver="$2" '
|
|
# /^## / { if (found) exit; found = ($2 == ver); next }
|
|
# ...
|
|
#
|
|
# No heading, no section — and release.yml's "refusing to publish an empty
|
|
# release" assert is the first thing that notices, one whole release too late.
|
|
#
|
|
# The rule, and why it needs no tuning: release headings are APPEND-ONLY. The
|
|
# ceremony (CONTRIBUTING, "Releases") adds one and never removes one; nothing
|
|
# else in the documented flow touches them. So SUPERSET is exact — it has no
|
|
# legitimate violation to carve an exception for. The stamp is covered for
|
|
# free: rewriting '## Unreleased' -> '## X.Y.Z — DATE' ADDS X.Y.Z and removes
|
|
# no X.Y.Z heading, because 'Unreleased' is not one. '## Unreleased' is
|
|
# deliberately NOT in the set this guards — the arming rule owns that heading,
|
|
# keyed on VERSION, and the ceremony legitimately consumes it.
|
|
#
|
|
# A file of its own, NOT a clause inside test/release.sh's arming check, for
|
|
# three reasons. Its input is different (a git history, not two files). Its
|
|
# degradation is different (no base ref is a SKIP, not a failure). And the
|
|
# arming rule is driven by test/release.sh against constructed VERSION +
|
|
# CHANGELOG.md trees that are not git repos at all — folding a git-dependent
|
|
# assert into it would make every one of those cases either skip or lie.
|
|
# Same discipline as release-lib.sh: its own file so a test can drive it.
|
|
|
|
base_ref="${1:-${CHANGELOG_MONOTONIC_BASE:-origin/main}}"
|
|
changelog="${2:-CHANGELOG.md}"
|
|
|
|
# Fail-closed switch: CI sets it, so a SKIP that would be a sensible local
|
|
# degradation becomes a red run there instead. A guard that can silently
|
|
# stop guarding is the failure shape this whole family of checks exists to
|
|
# refuse, so the skip path is loud and CI refuses to take it at all.
|
|
strict="${CHANGELOG_MONOTONIC_STRICT:-0}"
|
|
|
|
skip() {
|
|
if [ "$strict" = "1" ]; then
|
|
echo "changelog-monotonic: $* — and CHANGELOG_MONOTONIC_STRICT=1, so this is a FAILURE, not a skip." >&2
|
|
echo " CI sets STRICT because a guard that quietly stops guarding is worse than no guard." >&2
|
|
echo " Fix the checkout, not this script: the base ref must be fetched (fetch-depth: 0)." >&2
|
|
exit 1
|
|
fi
|
|
echo "changelog-monotonic: SKIPPED — $*"
|
|
echo " (Nothing was checked. In CI this same condition is a hard failure.)"
|
|
exit 0
|
|
}
|
|
|
|
[ -f "$changelog" ] || { echo "changelog-monotonic: no such file: $changelog" >&2; exit 1; }
|
|
|
|
git rev-parse --is-inside-work-tree >/dev/null 2>&1 \
|
|
|| skip "not inside a git work tree, so there is no history to compare against"
|
|
|
|
git rev-parse --verify --quiet "$base_ref^{commit}" >/dev/null \
|
|
|| skip "base ref '$base_ref' does not resolve here (a shallow clone, or a fork checkout without the upstream remote)"
|
|
|
|
merge_base="$(git merge-base "$base_ref" HEAD 2>/dev/null || true)"
|
|
[ -n "$merge_base" ] \
|
|
|| skip "no merge base between '$base_ref' and HEAD (unrelated histories, or a clone too shallow to reach one)"
|
|
|
|
# The set of RELEASE headings: '## <token> ...' where <token> looks like a
|
|
# version. Field $2, the same split changelog_section() uses, so the two
|
|
# cannot disagree about what a section header is. 'Unreleased' fails the
|
|
# shape and is excluded by construction.
|
|
headings_raw() {
|
|
awk '
|
|
/^## / && $2 ~ /^[0-9]+\.[0-9]+\.[0-9]+/ { print $2 }
|
|
'
|
|
}
|
|
headings() { headings_raw | sort -u; }
|
|
|
|
# The changelog may not exist at the merge base at all (the commit that adds
|
|
# it). Nothing to have deleted, so nothing to assert.
|
|
base_file="$(git show "$merge_base:$changelog" 2>/dev/null || true)"
|
|
[ -n "$base_file" ] || {
|
|
echo "changelog-monotonic: $changelog does not exist at the merge base ($(git rev-parse --short "$merge_base")) — nothing could have been deleted."
|
|
exit 0
|
|
}
|
|
|
|
# --- uniqueness on HEAD (the box#118 class) ----------------------------------
|
|
# Containment catches a DELETED heading. It cannot catch a DUPLICATED one: the
|
|
# duplicate is head-side SURPLUS, and `comm -23` (base minus head) is blind to
|
|
# extras on the head side — with or without `sort -u`, base {0.2.0} minus head
|
|
# {0.2.0, 0.2.0} is empty. Multiset comparison does not close it either, for
|
|
# the same reason. The assert that does is uniqueness of version headings ON
|
|
# HEAD, kept alongside containment rather than replacing it.
|
|
#
|
|
# This is the shape box#118's bad rebase produced: two `## 0.2.0 — 2026-07-19`
|
|
# headings with an incoming entry between them. Every other guard stays green
|
|
# — conflict markers absent, the arming rule happy (the top section is still
|
|
# right), tests and shellcheck clean.
|
|
#
|
|
# rig's symptom differs from box's, and the difference matters. box's
|
|
# release-notes.sh RE-ARMS its grab on every matching '## ' line, so a
|
|
# duplicate makes it ABSORB whatever sits between the copies. rig's
|
|
# changelog_section() has `if (found) exit`, so it stops dead at the second
|
|
# copy instead: a duplicate TRUNCATES. The published body is only what sits
|
|
# BETWEEN the two headings, and everything under the second copy — the real
|
|
# body of that release — is silently dropped. Different symptom, same class:
|
|
# no conflict, no red run, discovered only by a human reading the published
|
|
# notes.
|
|
#
|
|
# Nothing legitimate repeats a version heading: the ceremony stamps a NEW
|
|
# version, and 'Unreleased' fails the version shape and never reaches here.
|
|
dupes="$(headings_raw < "$changelog" | sort | uniq -d)"
|
|
if [ -n "$dupes" ]; then
|
|
{
|
|
echo "changelog-monotonic: $changelog has DUPLICATE release heading(s):"
|
|
echo
|
|
printf '%s\n' "$dupes" | sed 's/^/ ## /'
|
|
echo
|
|
cat <<EOF
|
|
Each version heading must appear exactly once. A repeat splits one release
|
|
into two same-named sections, and changelog_section() stops at the FIRST
|
|
'## ' line after the one it matched — so the published body for that version
|
|
is only what sits BETWEEN the copies, and the real body under the second
|
|
copy is dropped from the release notes entirely.
|
|
|
|
This is the box#118 shape: an entry meant for '## Unreleased' was inserted
|
|
after a shipped heading, and the heading re-added below it. The fix is one
|
|
heading, with the entry above it under '## Unreleased':
|
|
|
|
## Unreleased
|
|
|
|
### Fixed
|
|
|
|
- **Your entry**
|
|
|
|
## $(printf '%s\n' "$dupes" | head -1) — DATE <- exactly once
|
|
|
|
Quick check on any changelog-touching rebase:
|
|
|
|
diff <(git show origin/main:$changelog | grep '^## ') <(grep '^## ' $changelog)
|
|
EOF
|
|
} >&2
|
|
exit 1
|
|
fi
|
|
|
|
base_headings="$(printf '%s\n' "$base_file" | headings)"
|
|
head_headings="$(headings < "$changelog")"
|
|
|
|
# comm -23: lines in the base set that are NOT in the head set — exactly the
|
|
# headings this branch removed.
|
|
missing="$(comm -23 <(printf '%s\n' "$base_headings") <(printf '%s\n' "$head_headings"))"
|
|
|
|
if [ -n "$missing" ]; then
|
|
{
|
|
echo "changelog-monotonic: this branch DELETES release heading(s) from $changelog:"
|
|
echo
|
|
printf '%s\n' "$missing" | sed 's/^/ ## /'
|
|
echo
|
|
cat <<EOF
|
|
Present at the merge base ($(git rev-parse --short "$merge_base")), absent on HEAD.
|
|
|
|
Release headings are APPEND-ONLY. The ceremony adds one (CONTRIBUTING,
|
|
"Releases"); nothing ever legitimately removes one. So this is not a
|
|
judgement call — it is a defect, and almost always the same one (#98): an
|
|
entry written under '## Unreleased' REPLACED the heading below it instead of
|
|
being inserted ABOVE it. The shipped section's body is now sitting under
|
|
'## Unreleased', and the version it belonged to has no section at all.
|
|
|
|
Nothing else will say so. git merges that edit cleanly — no conflict, no
|
|
signal — and the arming rule stays green, because the TOP section is still
|
|
the right one for this VERSION. The damage surfaces at the NEXT release,
|
|
when changelog_section() cannot find the section it extracts by heading and
|
|
release.yml refuses to publish an empty release — one whole release late.
|
|
|
|
The fix is to put the heading back and INSERT above it, never over it:
|
|
|
|
## Unreleased
|
|
|
|
### Fixed
|
|
|
|
- **Your entry**
|
|
|
|
## $(printf '%s\n' "$missing" | head -1) — DATE <- untouched, still here
|
|
|
|
If you are genuinely renaming a released version, that is a rewrite of
|
|
history this guard is meant to stop; say so in the PR and change the guard
|
|
deliberately, in its own commit.
|
|
EOF
|
|
} >&2
|
|
exit 1
|
|
fi
|
|
|
|
count="$(printf '%s\n' "$base_headings" | grep -c . || true)"
|
|
echo "changelog-monotonic: all $count release heading(s) at the merge base ($(git rev-parse --short "$merge_base")) are still present in $changelog"
|