ci: add fork PR support to /rebase workflow#3174
Open
waveywaves wants to merge 1 commit intotektoncd:mainfrom
Open
ci: add fork PR support to /rebase workflow#3174waveywaves wants to merge 1 commit intotektoncd:mainfrom
waveywaves wants to merge 1 commit intotektoncd:mainfrom
Conversation
tekton-robot
added
the
kind/feature
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
tekton-robot
added
the
size/M
waveywaves
force-pushed
the
ci/rebase-fork-support
branch
from
c519c13 to
97fa0fe
Compare
Replace the hard fork rejection ("Cannot rebase PRs from forks") with
fork detection and maintainerCanModify validation. Fork PRs are now
rebased by checking out the fork repo, adding upstream as a remote for
the base branch, performing the rebase, and pushing back to the fork
with --force-with-lease.
This mirrors the fork support already implemented in the /squash
workflow (_squash-command.yaml), using the same pattern:
- Checkout the fork repo directly (origin = fork)
- Add upstream remote for the base branch
- Rebase onto upstream/<base> instead of origin/<base>
- Push to origin (which is the fork)
Fork PRs require the author to enable "Allow edits from maintainers"
in the PR settings. If disabled, the workflow posts an actionable error
message. Same-repo PR behavior is completely unchanged.
waveywaves
force-pushed
the
ci/rebase-fork-support
branch
from
97fa0fe to
e7ea7c7
Compare
Member
Author
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
2 participants
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.
Changes
Replace the hard fork rejection ("Cannot rebase PRs from forks") with fork detection and
maintainerCanModifyvalidation. Fork PRs are now rebased by checking out the fork repo, adding upstream as a remote for the base branch, performing the rebase, and pushing back to the fork with--force-with-lease.This mirrors the fork support already implemented in the
/squashworkflow (_squash-command.yamlfrom PR #3173), using the same pattern:origin= fork)upstream/<base>instead oforigin/<base>Fork PRs require the author to enable "Allow edits from maintainers" in the PR settings. If disabled, the workflow posts an actionable error message asking the author to enable it. Same-repo PR behavior is completely unchanged.
Motivation: All fork-based contributions (e.g., PRs #9366, #9367, #9368 on tektoncd/pipeline) currently cannot use
/rebase, forcing manual rebases. This is especially painful when multiple PRs need rebasing after dependency bumps land onmain./kind feature
Submitter Checklist
See the contribution guide for more details.