Skip to content

ci(gate): fewer full rebuilds: accept a clean, disjoint base; no full clean in a private build dir - #263

Merged
andersalm merged 4 commits into
developfrom
ci/gate-fewer-rebuilds
Oct 6, 2026
Merged

andersalm merged 4 commits into
developfrom
ci/gate-fewer-rebuilds

Conversation

@andersalm

Copy link
Copy Markdown
Contributor

Problem. The local pre-push gate forced a full rebuild far more often than needed:

  • It refused any branch that does not contain the newest develop (ci-local-prepush.py:119). So every merge into develop sent every open branch through another 10–15 minute check.
  • Before every compile it ran cargo clean -p for all repository packages, because the worktrees share one build directory.

Change.

  1. A branch based on an older develop is accepted when its merge with develop is clean and no path changed on the branch was also changed on develop. Otherwise the old refusal stays. The merged result is proven by the eight required PR checks (develop requires them; PR CI runs on the merge ref), as GitHub's non-strict protection already allows.
  2. The full clean is skipped only when the build directory is inside this worktree and is not the shared default target-build. Remote build boxes use this.

Tests. ci-local-prepush-test.py: 62 pass.

Written by Claude Opus. Reviewed by GPT-6 Sol: MODIFY (no unchecked override; say CI proves the merge), done.

@andersalm

Copy link
Copy Markdown
Contributor Author

Verdict record: candidate 3dd877c (head) = cf5d70ab + 9f6bb3c1, rebased with no change to the reviewed bytes. Review by GPT-6 Sol: MODIFY (drop the override; say CI proves the merge), fixed in 9f6bb3c1. ci-local-prepush-test: 62 OK.
CI: the first run failed in an unrelated flaky Rust test (update_controller second_owner_action…, being fixed); the rerun is green.

@andersalm

Copy link
Copy Markdown
Contributor Author

Candidate ed914a4: merges develop e844fb5 into the reviewed 3dd877c. Delta: the conflict at ci-local-prepush.py:554. Kept this PR's private build-dir rule; dropped the two disk_reserve calls that #234 removed. ci-local-prepush-test: 61 OK.

@andersalm
andersalm merged commit 3d3fdd9 into develop Oct 6, 2026
11 checks passed
@andersalm
andersalm deleted the ci/gate-fewer-rebuilds branch October 6, 2026 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant