recipe-maintainers/cc-ci-orchestrator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squash weekly recipe PRs to one commit before CI #37

Merged
autonomic-bot merged 1 commits from fix/squash-recipe-pr-before-ci into main 2026-11-09 20:30:58 +00:00
Conversation 0 Commits 1 Files Changed 3
+40 -39
autonomic-bot commented 2026-11-09 20:30:47 +00:00
Owner
Copy Link
Copy Source

The weekly upgrader currently keeps old commits and merge commits on recipe PR branches. Mailu PR #9 showed five commits even though its net diff against upstream touched only three files.

This change publishes the final recipe tree as one commit whose parent is the current upstream tip before !testme. Existing upgrade PR branches are updated with --force-with-lease, so a concurrent change is rejected. Retry instructions send fixes through the same squash step before CI runs again.

Verified:

  • bash -n and git diff --check passed.
  • Local Git integration test covered new and existing PR branches: each had one commit, the current upstream parent, and the intended tree.
  • Live Gitea test on a disposable open PR: the same PR remained open after the guarded rewrite, and Gitea reported one commit above its base. The disposable repo was removed afterward.
The weekly upgrader currently keeps old commits and merge commits on recipe PR branches. Mailu PR #9 showed five commits even though its net diff against upstream touched only three files. This change publishes the final recipe tree as one commit whose parent is the current upstream tip before `!testme`. Existing upgrade PR branches are updated with `--force-with-lease`, so a concurrent change is rejected. Retry instructions send fixes through the same squash step before CI runs again. Verified: - `bash -n` and `git diff --check` passed. - Local Git integration test covered new and existing PR branches: each had one commit, the current upstream parent, and the intended tree. - Live Gitea test on a disposable open PR: the same PR remained open after the guarded rewrite, and Gitea reported one commit above its base. The disposable repo was removed afterward.
autonomic-bot added 1 commit 2026-11-09 20:30:48 +00:00
fix: squash weekly recipe PRs before CI 22d8ea0ae9
autonomic-bot merged commit 19f0329d62 into main 2026-11-09 20:30:58 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
aadil (alizeh) autonomic autonomic-bot kawaiipunk (KawaiiPunk) notplants spacehobo (Nick Moffitt) trav (Trav Fryer)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: recipe-maintainers/cc-ci-orchestrator#37