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

Rebase suppress hello #3

Merged
merged 253 commits into from
Mar 21, 2016
Merged

Rebase suppress hello #3

merged 253 commits into from
Mar 21, 2016

Conversation

fgimenez
Copy link

Hi @directhex :) I've seen that you had prepared a PR for fixing the annoying multiple messages from ghprb jenkinsci#276, but never got merged. This PR tries to fix that, is basically a rebase and a conflict fix around https://github.com/directhex/ghprb/compare/suppress-hello...fgimenez:rebase-suppress-hello?expand=1#diff-70706d3124e337b7f717ad901c08d53aR118 pls have a look and let me know if something is missing.

Thx!

arcivanov and others added 30 commits July 10, 2015 04:04
Also fix an issue where the git user may not match the github user
Extend the options in the merge step.
Prevent null pointer when checking isOwnCode
Fix tests and add a test for pr user login
Add ghprbTriggerLogin to allow mentions in the status comments
All regex matching uses DOTALL and IGNORECASE.
The trigger phrase has been updated to be a regex.  If it had special characters, they have been quoted.
Add the description to the cause and env variables
Allow multiline for regex.  Trigger is regex.  Add description.
1. Fix NPEs where `triggerSender` is not available
2. Infer intent to merge based on comment trigger
3. If merge can only triggered by comment and there is no comment, there is no intent to merge, therefore do not fail or check other conditions
4. Do not post comments about commentors not being Admins etc if build is triggered by automation

connected to jenkinsci#158, fixes jenkinsci#158
…the only possible one

Update unit tests to validate new behavior
…to pulled repo

- Added support for GitHub contexts and messages to be added from downstream jobs
The problem was that job.getBuilds() would return the ongoing matrix
root build, causing to build the previous SHA1 in case a commit was not
the first of the pull request.

The current fix breaks the “smart changes” logic for matrix jobs.
A proper fix that preserves this functionality because it would be very
hard to determine which is a root build of the same run, especially if
the concurrent builds options is enabled.

The PR also simplifies some logic.
DavidTanner and others added 27 commits February 12, 2016 09:45
All getters should use get, and not is
Ghprb.extractTrigger could return null
When the build is scheduled, add an extension that will go back and cancel queued builds, and abort running builds.
Fixes jenkinsci#272 and fixes jenkinsci#241
Make it so that extensions we want to default from global make it to the project.
Add some try catch clauses to canceling queue items and active run objects.
Fix NPE when last build has been deleted
update 'githubPullRequest' to 'pullRequest' in Job DSL section of README
Trigger should only be applicable to AbstractProject items
directhex added a commit that referenced this pull request Mar 21, 2016
@directhex directhex merged commit c5b08ef into directhex:suppress-hello Mar 21, 2016
@fgimenez fgimenez deleted the rebase-suppress-hello branch March 21, 2016 12:54
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.