ci: one-shot helper to force-update protected overlay tips - #286
Merged
omegent-app[bot] merged 1 commit intoAug 2, 2026
Merged
Conversation
Allows restacking protected overlay branches (e.g. fork/identity) after a local conflict resolve, using FORK_STACK_DEPLOY_KEY like compose does. Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
omegent-app
Bot
changed the title
omegent-app
Bot
force-pushed
the
fix/overlay-identity-import-resolve
branch
from
August 2, 2026 07:22
549516c to
1e9d20f
Compare
patroza
added a commit
that referenced
this pull request
Aug 4, 2026
Allows restacking protected overlay branches (e.g. fork/identity) after a local conflict resolve, using FORK_STACK_DEPLOY_KEY like compose does. Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com> Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
patroza
added a commit
that referenced
this pull request
Aug 4, 2026
Allows restacking protected overlay branches (e.g. fork/identity) after a local conflict resolve, using FORK_STACK_DEPLOY_KEY like compose does. Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com> Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
patroza
added a commit
that referenced
this pull request
Aug 4, 2026
Allows restacking protected overlay branches (e.g. fork/identity) after a local conflict resolve, using FORK_STACK_DEPLOY_KEY like compose does. Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com> Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
patroza
added a commit
that referenced
this pull request
Aug 5, 2026
Allows restacking protected overlay branches (e.g. fork/identity) after a local conflict resolve, using FORK_STACK_DEPLOY_KEY like compose does. Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com> Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
`fork/identity` is protected (no force-push from normal tokens). After a local restack onto `fork/changes`, compose cannot update the overlay tip without the deploy key.
Fix
Add a `workflow_dispatch` helper that force-with-lease updates an overlay branch tip using `FORK_STACK_DEPLOY_KEY` (same key as compose).
After merge, run:
```sh
gh workflow run force-update-overlay-tip.yml \
-f target_branch=fork/identity \
-f source_ref=fix/identity-rebased-tip \
-f expected_old_tip=
gh workflow run compose-integration.yml
```