fix(release): preserve tag ancestry during source promotion

This commit is contained in:
Kevin Yue committed 2026-11-12 22:57:06 +08:00
1 parent 6e99d8d81f
commit 1547d0c1e9
3 files changed
+8 -12

No files matched your search

+4 -4
View File
@@ -36,13 +36,13 @@ PY
branch="chore/promote-$tag"
git switch -c "$branch" origin/main
git merge --no-commit --no-ff "$release_sha"
git merge --ff --no-edit "$release_sha"
cp "$artifact_dir/flake.nix" "$artifact_dir/flake.lock" .
python3 "$script_dir/validate-release-version.py" --version "${tag#v}"
# Check against Cargo too: overriding the expectation above is only for artifacts.
python3 "$script_dir/validate-release-version.py"
git add flake.nix flake.lock
if ! git diff --cached --quiet || [[ -f "$(git rev-parse --git-path MERGE_HEAD)" ]]; then
git commit -m "release: promote $tag sources and Nix packages together"
if ! git diff --cached --quiet; then
git commit -m "release: validate Nix packages for $tag"
fi
echo "Prepared $branch. Review the candidate, push normally, and open one PR against main."
echo "Prepared $branch. Open one PR against main and use a regular merge to preserve $tag in main's history."