Skip to content

Support github pull request merge action #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Support github pull request merge action #117

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1531c34
add merged field to pull request struct
resec Jul 6, 2021
3f1f53e
use parsed merged field directly
resec Jul 6, 2021
3582ca2
set pr merge action if it is merged and closed
resec Jul 6, 2021
4523e75
fix typo
resec Jul 6, 2021
f2f8308
fix error
resec Jul 6, 2021
b4e8c67
set merged to true to fix test case
resec Jul 6, 2021
d737085
add merged = true field to fix test case
resec Jul 6, 2021
f97ab81
revert change
Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions scm/driver/github/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,11 @@ func (s *webhookService) parsePullRequestHook(data []byte) (scm.Webhook, error)
case "edited":
dst.Action = scm.ActionUpdate
case "closed":
// TODO(bradrydzewski) github does not provide a merged action,
// but this is provided by gitlab and bitbucket. Is it possible
// to emulate the merge action?

// if merged == true
// dst.Action = scm.ActionMerge
dst.Action = scm.ActionClose
if dst.PullRequest.Merged {
dst.Action = scm.ActionMerge
} else {
dst.Action = scm.ActionClose
}
case "reopened":
dst.Action = scm.ActionReopen
case "synchronize":
Expand Down