Release ordering: merging a version-only head triggers duplicate CI and stalls its release gate #409

Closed
opened 2026-10-22 20:31:13 +02:00 by buildagent · 1 comment
Member

Observed while releasing PR #407 / v0.41.9.

Graph and evidence:

  • 77df6f83: full source qualification green (core, Windows, transport, corpus, packages, pilots).
  • 44fec715: only workspace version 0.41.8 -> 0.41.9 in four declared sites. version_bump.sh --version-only passes; PR workflows 1477–1480 correctly inherit the parent and succeed.
  • 26d911a2: merges that PR into the old master. Its tree is byte-identical to 44fec715, which is a merged ancestor. Its first-parent diff includes the feature, so the merge itself is not version-only.
  • Master workflows 1481–1484 start full qualification: the same-tree twin 44fec715 has skipped grading jobs, so it does not supply a full green verdict.
  • Release run 1485, tagged at 44fec715, sees the newer same-tree master jobs running. Normal precedence correctly waits for them instead of the older green parent; it does not bypass a running or failed verdict.

Prefer a simple release-process fix: merge the fully qualified source first, then make/merge the version-only release change, so the final merge's own first-parent diff is version-only. Document and exercise that graph before introducing recursive inheritance machinery. Preserve fail-closed behavior for changed source, unrelated parents, a red/cancelled run or an unmeasured proof. No gate override, cancellation, tag movement or CI deletion was used to work around the current release; its normal gate remains in force.

Acceptance: one full qualification for the source plus the existing bounded metadata/pilot checks for the bump/merge, with the release gate accepting the proven graph. A fixture should cover the version-only merge shape explicitly and retain the current negative controls.

Observed while releasing PR #407 / v0.41.9. Graph and evidence: - `77df6f83`: full source qualification green (core, Windows, transport, corpus, packages, pilots). - `44fec715`: only workspace version 0.41.8 -> 0.41.9 in four declared sites. `version_bump.sh --version-only` passes; PR workflows 1477–1480 correctly inherit the parent and succeed. - `26d911a2`: merges that PR into the old master. Its tree is byte-identical to `44fec715`, which is a merged ancestor. Its first-parent diff includes the feature, so the merge itself is not version-only. - Master workflows 1481–1484 start full qualification: the same-tree twin `44fec715` has skipped grading jobs, so it does not supply a full green verdict. - Release [run 1485](https://git.h-dv.de/h-dv/code-index/actions/runs/1485), tagged at `44fec715`, sees the newer same-tree master jobs running. Normal precedence correctly waits for them instead of the older green parent; it does not bypass a running or failed verdict. Prefer a simple release-process fix: merge the fully qualified source first, then make/merge the version-only release change, so the final merge's own first-parent diff is version-only. Document and exercise that graph before introducing recursive inheritance machinery. Preserve fail-closed behavior for changed source, unrelated parents, a red/cancelled run or an unmeasured proof. No gate override, cancellation, tag movement or CI deletion was used to work around the current release; its normal gate remains in force. Acceptance: one full qualification for the source plus the existing bounded metadata/pilot checks for the bump/merge, with the release gate accepting the proven graph. A fixture should cover the version-only merge shape explicitly and retain the current negative controls.
Author
Member

Verified a concrete release sequence against require_ci_green.sh and ci_changes.sh while preparing PR #411. Merely merging source first is not sufficient if the tagged version-only commit has the source merge commit as its parent and that merge inherited all of its qualification from the PR head: decide() resolves BUMP_PARENT's rows directly and does not recursively search its same-tree twins.

Existing gates support a simpler sequence without code changes: (1) merge the fully qualified source PR; (2) create the version-only release branch from the already-qualified source PR head, which is now a merged ancestor; (3) verify the source merge tree matches that head; (4) merge the version-only PR; (5) tag the version-only PR HEAD, now also a merged ancestor, whose direct parent has real green qualification rows. Verify the version merge's first-parent diff is version-only and its tree equals the tagged head.

ci_changes.sh can skip the source merge by same-tree qualification and the version merge by assessing its parent's same-tree qualification. The release tag on the version-only PR head then inherits its DIRECT parent's actual green rows. Tagging the version merge instead would add another inheritance level and can refuse. This keeps the existing no-skip-chains rule and avoids recursive CI machinery or weakened gates.

Verified a concrete release sequence against require_ci_green.sh and ci_changes.sh while preparing PR #411. Merely merging source first is not sufficient if the tagged version-only commit has the source merge commit as its parent and that merge inherited all of its qualification from the PR head: decide() resolves BUMP_PARENT's rows directly and does not recursively search its same-tree twins. Existing gates support a simpler sequence without code changes: (1) merge the fully qualified source PR; (2) create the version-only release branch from the already-qualified source PR head, which is now a merged ancestor; (3) verify the source merge tree matches that head; (4) merge the version-only PR; (5) tag the version-only PR HEAD, now also a merged ancestor, whose direct parent has real green qualification rows. Verify the version merge's first-parent diff is version-only and its tree equals the tagged head. ci_changes.sh can skip the source merge by same-tree qualification and the version merge by assessing its parent's same-tree qualification. The release tag on the version-only PR head then inherits its DIRECT parent's actual green rows. Tagging the version merge instead would add another inheritance level and can refuse. This keeps the existing no-skip-chains rule and avoids recursive CI machinery or weakened gates.
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
h-dv/code-index#409
No description provided.