bherbruckandClaude Opus 5.5
9a07932f20
A PR that saves something new adds crates/doc/src/format/pending/<name>.rs (a note, and an upgrade step if older designs must be rewritten). The build writes the next format number while changes are pending and lists them in format_pending; scripts/fold-format-pending.sh fixes them as v<N>/ at release time. Formats 23 and 24 move into v23/ and v24/. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
48 lines
2.4 KiB
Bash
Executable File
48 lines
2.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Checks the design-format change files (crates/doc/src/format/): two branches that each add a
|
|
# pending change merge without a conflict, and the release fold moves both into the next number.
|
|
# The order they apply in and the upgrades themselves are tested in crates/doc/src/format.rs.
|
|
set -euo pipefail
|
|
|
|
root=$(git rev-parse --show-toplevel)
|
|
tmp=$(mktemp -d)
|
|
trap 'rm -rf "$tmp"' EXIT
|
|
repo="$tmp/repo"
|
|
mkdir -p "$repo/crates/doc/src" "$repo/scripts"
|
|
cp -r "$root/crates/doc/src/format" "$repo/crates/doc/src/"
|
|
cp "$root/crates/doc/build.rs" "$repo/crates/doc/"
|
|
cp "$root/scripts/fold-format-pending.sh" "$repo/scripts/"
|
|
rm -f "$repo"/crates/doc/src/format/pending/*.rs # start from a release: nothing pending
|
|
git() { command git -C "$repo" -c user.name=test -c user.email=test@example.com "$@"; }
|
|
git init -q -b main
|
|
git add -A
|
|
git commit -qm base
|
|
|
|
change() {
|
|
git switch -q -c "$1" main
|
|
printf '//! %s\n' "$1" > "$repo/crates/doc/src/format/pending/$1.rs"
|
|
git add -A
|
|
git commit -qm "$1"
|
|
}
|
|
change b-second
|
|
change a-first
|
|
|
|
git switch -q main
|
|
if ! tree=$(git merge-tree --write-tree a-first b-second); then
|
|
echo "FAIL: two pending format changes conflict" >&2
|
|
exit 1
|
|
fi
|
|
git merge -q --no-edit a-first b-second >/dev/null
|
|
listed=$(git ls-tree --name-only HEAD crates/doc/src/format/pending/ | grep '\.rs$' | sed 's#.*/##' | tr '\n' ' ')
|
|
[ "$listed" = "a-first.rs b-second.rs " ] || { echo "FAIL: merged pending changes are: $listed" >&2; exit 1; }
|
|
[ "$tree" = "$(git rev-parse HEAD^{tree})" ] || { echo "FAIL: merge-tree and merge disagree" >&2; exit 1; }
|
|
|
|
before=$(ls -d "$repo"/crates/doc/src/format/v*/ 2>/dev/null | wc -l)
|
|
(cd "$repo" && bash scripts/fold-format-pending.sh) > "$tmp/fold.log"
|
|
after=$(ls -d "$repo"/crates/doc/src/format/v*/ | sort -V | tail -1)
|
|
[ "$(ls -d "$repo"/crates/doc/src/format/v*/ | wc -l)" -eq $((before + 1)) ] || { echo "FAIL: the fold made no new version" >&2; exit 1; }
|
|
[ "$(ls "$after")" = "$(printf 'a-first.rs\nb-second.rs')" ] || { echo "FAIL: the fold moved $(ls "$after")" >&2; exit 1; }
|
|
[ -z "$(ls "$repo/crates/doc/src/format/pending/" | grep '\.rs$' || true)" ] || { echo "FAIL: pending changes left after the fold" >&2; exit 1; }
|
|
(cd "$repo" && bash scripts/fold-format-pending.sh) | grep -q "No pending format changes" || { echo "FAIL: a second fold did something" >&2; exit 1; }
|
|
echo "ok: pending format changes merge cleanly and fold into $(basename "$after")"
|