Squashing support - Githubissues

megawac commented 9 years ago

This should allow a collaborator to make a comment like @jsdelivrbot squash and merge in a PR issue and the bot will attempt to merge it

The following steps are used whenever a comment is made on a pr (not a diff comment)

[x] check to see if the comment is matched by the regexp merge_re
[x] Validate commentor is a collaborator
[x] Ensure issue has more than 1 commit in it (I don't know what will happen if this isn't the case)
[x] Create a commit message that will close the current issue (if successful) (e.g. Add jquery; closes #4500). Currently the commit message is based on the PR title
[x] Execute that shell script (read the steps it follows there
[x] Push the squashed commit and close the PR
[x] Send a message if it fails

Some testing is still needed (the shell script works but I'm not sure if the comment checking (matching the merge_re regexp) works yet)

/cc @jimaek

Fixes #22; Fixes #34

jimaek commented 9 years ago

So it auto-merges and closes the PR? I guess this means that we send the command only once everything is 100% fixed

megawac commented 9 years ago

Yeah its a command for when the PR is good to go besides # of commits

For example:

jimaek commented 9 years ago

Ok great, thank you. Is it good to merge?

megawac commented 9 years ago

Finishing a couple more tests - I'll merge it a bit later

jsdelivr / bot