Skip to content

codex: isolate release recovery validation #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ttaylorr-oai merged 1 commit into from
Aug 7, 2026
+22 −9
Merged

codex: isolate release recovery validation #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions .github/workflows/codex-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6910,9 +6910,11 @@ recover_release_pin_core () {
GIT_COMMITTER_EMAIL="$bot_email" \
git commit-tree "$tree" -p "$meta_oid" <"$message"
) || die "could not create release recovery plan commit"
validate_plan_transition_core will-create "$expected_blob" \
--remote "$remote" \
--base-commit "$meta_oid" --head-commit "$plan_commit"
(
validate_plan_transition_core will-create "$expected_blob" \
--remote "$remote" \
--base-commit "$meta_oid" --head-commit "$plan_commit"
) || die "release recovery did not pass canonical pre-push validation"
git diff-tree --no-commit-id --name-only -r "$meta_oid" \
"$plan_commit" | LC_ALL=C sort \
>"$tmp_dir/recovery-changed-paths" ||
Expand All @@ -6929,9 +6931,11 @@ recover_release_pin_core () {
read_lane_plan "$plan_commit" codex-unstable "$codex_name" \
"$codex_oid" - "$tmp_dir/proposed-unstable-topics" \
"$tmp_dir/proposed-unstable-plan"
validate_pinned_plan_policy "$tmp_dir/proposed-plan" \
"$tmp_dir/proposed-unstable-plan" "$base_name" 3 \
"$tmp_dir/published-state"
(
validate_pinned_plan_policy "$tmp_dir/proposed-plan" \
"$tmp_dir/proposed-unstable-plan" "$base_name" 3 \
"$tmp_dir/published-state"
) || die "release recovery did not pass pinned plan policy"
test "$(plan_tip "$tmp_dir/proposed-plan/desired-prerequisites" \
"$topic")" = "$new_tip" ||
die "release recovery did not retain the exact new source"
Expand Down Expand Up @@ -6964,9 +6968,11 @@ recover_release_pin_core () {
test "$(git rev-parse "$(remote_ref "$remote" "$pin_name")")" = \
"$new_tip" ||
die "remote release recovery pin does not name $new_tip"
validate_plan_transition_core require-pin "$expected_blob" \
--remote "$remote" --base-commit "$meta_oid" \
--head-commit "$plan_commit"
(
validate_plan_transition_core require-pin "$expected_blob" \
--remote "$remote" --base-commit "$meta_oid" \
--head-commit "$plan_commit"
) || die "published release recovery did not pass canonical validation"
git cat-file -e "$plan_commit:$release_recovery_path" 2>/dev/null &&
die "release recovery manifest survived its one-shot transition"
say "published one-shot release recovery $plan_commit"
Expand Down
7 changes: 7 additions & 0 deletions t/t9905-codex-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9054,6 +9054,13 @@ test_expect_success 'one-shot release recovery pins only the exact merged source
"$old" "$automation_codex_tip" "$old_tree") &&
git branch codex "$codex_tip" &&
create_unstable_sentinel codex &&
git switch -c zz/codex/extra-unstable codex &&
write extra extra-unstable-file &&
git add extra-unstable-file &&
git commit -m "unrelated unstable source boundary" &&
git switch codex-unstable &&
git merge --no-ff zz/codex/extra-unstable \
-m "Merge unrelated unstable boundary" &&
git branch meta master &&
install_pinned_meta_state meta master codex codex-unstable &&
baseline=$(git rev-parse meta) &&
Expand Down