-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
Make expedite's branch form more flexible #135
Conversation
* iss-123_describe_branch * iss_123_describe_branch
|
||
self.title = "#{issue} #{descr}" | ||
self.title = "#{issue} #{descr.capitalize}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Capitalize the first letter of the description
lib/octopolo/scripts/pull_request.rb
Outdated
|
||
def check_branch_format | ||
return if /.*-\d+_.*/ =~ git.current_branch | ||
return if (/.*-\d+_.*/ =~ git.current_branch || /.*_\d+_.*/ =~ git.current_branch) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/[A-Za-z]+-\d+_.*/
and /[A-Za-z]+_\d+_.*/
for regex because we probably want them to always start with a letter.
|
||
def check_branch_format | ||
return if /.*-\d+_.*/ =~ git.current_branch | ||
return if (/[a-zA-Z]+-\d+_.*/ =~ git.current_branch || /[a-zA-Z]+_\d+_.*/ =~ git.current_branch) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this be rewritten as return if /[a-zA-Z]+[-_]\d+_.*/ =~ git.current_branch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah oh yes, that would probably work as well... checking for either _
or -
.
Thanks @pete2786 ! |
Has QA approval |
What
Make
expedite
's branch form more flexible. So takeiss-123_describe_branch
, but also acceptiss_123_describe_branch
as well.Why
Because with all underscores is the form that I use, so I want to be able to use expedite with my branches.
Deploy Plan
Rollback Plan
git revert -m 1 MERGE_SHA
and perform another deploy.URLs
QA Plan
iss_123_describe_branch
in another directoryiss-123_describe_branch
in the same directorybundle exec bin/op pull-request -x
with both branches you made