Skip to content

Commit

Permalink
cherrypicker: allow cherry-pick in command
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhita committed Jun 25, 2019
1 parent 0b17ca8 commit 7cdb8ce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions prow/external-plugins/cherrypicker/server.go
Expand Up @@ -38,7 +38,7 @@ import (

const pluginName = "cherrypick"

var cherryPickRe = regexp.MustCompile(`(?m)^/cherrypick\s+(.+)$`)
var cherryPickRe = regexp.MustCompile(`(?m)^(?:/cherrypick|/cherry-pick)\s+(.+)$`)
var releaseNoteRe = regexp.MustCompile(`(?s)(?:Release note\*\*:\s*(?:<!--[^<>]*-->\s*)?` + "```(?:release-note)?|```release-note)(.+?)```")

type githubClient interface {
Expand All @@ -65,7 +65,7 @@ func HelpProvider(enabledRepos []string) (*pluginhelp.PluginHelp, error) {
Featured: true,
// depends on how the cherrypick server runs; needs auth by default (--allow-all=false)
WhoCanUse: "Members of the trusted organization for the repo.",
Examples: []string{"/cherrypick release-3.9"},
Examples: []string{"/cherrypick release-3.9", "/cherry-pick release-1.15"},
})
return pluginHelp, nil
}
Expand Down

0 comments on commit 7cdb8ce

Please sign in to comment.