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."
+3 -2
View File
@@ -119,7 +119,7 @@ class SourceSelectionTests(unittest.TestCase):
class PromotionTests(unittest.TestCase):
def test_sources_and_flake_are_committed_together_preserving_main_work(self):
def test_promotion_keeps_tag_history_and_adds_flake_commit(self):
with tempfile.TemporaryDirectory() as temp:
root = Path(temp)
repo, origin, artifact = root / 'repo', root / 'origin.git', root / 'artifact'
@@ -149,7 +149,8 @@ class PromotionTests(unittest.TestCase):
self.assertEqual(git(repo, 'show', f'{old}:Cargo.toml'), '[workspace.package]\nversion = "3.1.0"')
self.assertTrue((repo / 'infrastructure').exists())
self.assertTrue((repo / 'feature').exists())
self.assertEqual(git(repo, 'rev-list', '--parents', '-1', 'HEAD').split()[1:], [main, release])
self.assertEqual(git(repo, 'rev-list', '--parents', '-1', 'HEAD^').split()[1:], [main, release])
self.assertEqual(git(repo, 'diff', '--name-only', 'HEAD^', 'HEAD'), 'flake.nix')
self.assertEqual(git(repo, 'status', '--porcelain'), '')