jiriks74/create-pull-request
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add an override for the base branch

Browse source
This commit is contained in:
Peter Evans 2019-10-21 20:17:31 +09:00
parent c5ff844b40
commit 8c2a43987b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -51,6 +51,7 @@ These variables are *all optional*. If not set, sensible default values will be
| `PULL_REQUEST_TEAM_REVIEWERS` | A comma separated list of GitHub teams to request a review from. | none | | `PULL_REQUEST_TEAM_REVIEWERS` | A comma separated list of GitHub teams to request a review from. | none |
| `PULL_REQUEST_MILESTONE` | The number of the milestone to associate this pull request with. | none | | `PULL_REQUEST_MILESTONE` | The number of the milestone to associate this pull request with. | none |
| `PULL_REQUEST_BRANCH` | The branch name. See **Branch naming** below for details. | `create-pull-request/patch` | | `PULL_REQUEST_BRANCH` | The branch name. See **Branch naming** below for details. | `create-pull-request/patch` |
| `PULL_REQUEST_BASE` | Overrides the base branch. **Use with caution!** | Defaults to the currently checked out branch. |
| `BRANCH_SUFFIX` | The branch suffix type. Valid values are `short-commit-hash`, `timestamp`, `random` and `none`. See **Branch naming** below for details. | `short-commit-hash` | | `BRANCH_SUFFIX` | The branch suffix type. Valid values are `short-commit-hash`, `timestamp`, `random` and `none`. See **Branch naming** below for details. | `short-commit-hash` |
**Output environment variables** **Output environment variables**

9
create-pull-request.py
View file

@ -184,12 +184,17 @@ if skip_ignore_event or not ignore_event(event_name, event_data):
# Set the base branch # Set the base branch
github_ref = os.environ['GITHUB_REF'] github_ref = os.environ['GITHUB_REF']
if github_ref.startswith('refs/pull/'): if github_ref.startswith('refs/pull/'):
# Switch to the merging branch instead of the merge commit
base = os.environ['GITHUB_HEAD_REF'] base = os.environ['GITHUB_HEAD_REF']
# Reset to the merging branch instead of the merge commit
repo.git.checkout(base)
else: else:
base = github_ref[11:] base = github_ref[11:]
# Optional base override
base = os.getenv('PULL_REQUEST_BASE', base)
# Checkout the base branch
repo.git.checkout(base)
# Skip if the current branch is a PR branch created by this action # Skip if the current branch is a PR branch created by this action
if base.startswith(branch): if base.startswith(branch):
print("Branch '%s' was created by this action. Skipping." % base) print("Branch '%s' was created by this action. Skipping." % base)