Skip to content
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

Parameterize comment phrase to trigger a build #45

Merged

Conversation

nblair
Copy link
Contributor

@nblair nblair commented May 29, 2015

This pull request makes the comment phrase to trigger a build part of the configuration.

Defaults to "test this please" for backwards compatibility.

@nblair
Copy link
Contributor Author

nblair commented May 29, 2015

Looks like this duplicates pull request #11, which mentions some conflicts.

@damovsky
Copy link
Collaborator

hi,
can you, please resolve the conflicts? e.g. by rebasing your change, etc...

I'm going to check all PRs and eventually merge them

Defaults to prior "test this please", can be overridden in the job
configuration.
@nblair nblair force-pushed the parameterize-comment-build-trigger branch from 4a54863 to 96e6cb6 Compare February 18, 2017 21:19
@nblair
Copy link
Contributor Author

nblair commented Feb 18, 2017

Rebase is finished. I don't have the access to the environment I originally developed this with, so I don't have a way to end to end test the changes, YMMV.

@nblair
Copy link
Contributor Author

nblair commented Feb 18, 2017

I'll see what I can do to get tests passing.

Refactor to move default value for commentTrigger to config.jelly. Handle special case in BitbucketBuildRepository where trigger field is null within unit tests (since BitbucketBuildTrigger can't be mocked or initialized in the test).
@damovsky
Copy link
Collaborator

oops, sorry to admit that, but I need you to rebase your change again...looks like in the meantime some change introduce the conflict . Once you rebase it I'll immediately merge it, I promise!

@nblair
Copy link
Contributor Author

nblair commented Feb 23, 2017

Ack, I merged with master to resolve the last conflicts. Would you rather a cherry pick my commits to a new branch and re-submit? Or can I merge with master again?

@damovsky
Copy link
Collaborator

@nblair it's up to you...what is easy & faster for you? ( the thing is there are many open PRs which I will process in near time and I don't want to bother you again and again with resolving conflicts)

@nblair
Copy link
Contributor Author

nblair commented Feb 23, 2017

Merge was a lot easier than rebase, just pushed.

@damovsky damovsky merged commit 4d049ed into nishio-dens:master Feb 23, 2017
@damovsky
Copy link
Collaborator

thank you, @nblair for your help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants