This repository has been archived by the owner on May 7, 2024. It is now read-only.
Support rebasing PR from forks and allow only selected users to rebase #17
Conversation
This file contains 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
drdanz
added a commit
to robotology/yarp
that referenced
this pull request
Sep 24, 2019
For now use this branch: https://github.com/drdanz/rebase/tree/pr_from_fork until cirrus-actions/rebase#17 is accepted upstream.
This works only if the "Allow edit from maintainers" option is checked
and the `GITHUB_TOKEN` variable is set using a developer token, i.e.
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_OAUTH_TOKEN }}
Instead of using a generic name and address, fetch these information from using the GitHub API.
If an environment variable `<user_login>_TOKEN` exists, that variable is
used instead of `GITHUB_TOKEN`.
This makes it possible to allow only some users to rebase the PRs by
setting
env:
<user1>_TOKEN: ${{ secrets.<user1>_TOKEN }}
<user2>_TOKEN: ${{ secrets.<user2>_TOKEN }}
drdanz
force-pushed
the
pr_from_fork
branch
from
0dee9e7 to
81000d9
Compare
|
rebased over latest master |
fkorotkov
reviewed
Sep 27, 2019
|
|
||
| git remote set-url origin https://x-access-token:$COMMITTER_TOKEN@github.com/$GITHUB_REPOSITORY.git | ||
| git config --global user.email "$USER_EMAIL" | ||
| git config --global user.name "$USER_NAME" |
There was a problem hiding this comment.
I think you should do the user customization here only if USER_TOKEN is defined. Otherwise you should fall back to the original logic. What do you think?
There was a problem hiding this comment.
To be honest I'd like to be able to know who started the rebase...
|
/rebase |
1 similar comment
|
/rebase |
|
/rebase |
Closed
|
@fkorotkov any blockers to merging this? This seems to solve a very important use case :) |
|
@mikeparker I just don't like that "solution" but unfortunately it seems there is no other way to support it at the moment. |
vorburger
added a commit
to vorburger/rebase
that referenced
this pull request
May 10, 2020
fkorotkov
pushed a commit
that referenced
this pull request
May 11, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Support rebasing PR from forks
This works only if the "Allow edit from maintainers" option is checked
and the
GITHUB_TOKENvariable is set using a developer token, i.e.Fixes #12
Use the user name and email for committer name
Instead of using a generic name and address, fetch these information
from using the GitHub API.
Allow user based tokens
If an environment variable
<user_login>_TOKENexists, that variable isused instead of
GITHUB_TOKEN.This makes it possible to allow only some users to rebase the PRs by
setting