Merge only works when trigger phrase is present #257 #429
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…mmit message for your changes. Lines starting
Add an option to not have the GHPRB manage its webhooks. This is preferable in cases where we have a lot of projects pointing at the same repo, or when the ghprb account has no admin access to the repo
This change reduces the number of API calls made by the ghprb plugin. .NET CI was hitting rate limits pretty regularly. There are a few major improvements:
* When using webhooks, we do not check comments (pull comment data) except when absolutely necessary. We recieve all the comment info through the hooks, so we only need to check for updated comments when we have a new pull request or when jenkins restarts.
* Never force a GH pull request update when a comment update comes through. If a comment update came through, we're using webhooks and will have gotten the updated PR event.
* initGhRepository isn't necessary when a GhprbRepository is created. It's not used in the pull request trigger init, and causes an API call. It can be called on demand as necessary. This also dramatically improves startup time in Jenkins instances that have a lot of PR triggered jobs
Additional fixes:
* Fixes a case where the pull request data wasn't saved on a GH hash update (which leads to most PRs restarting testing on any comment if Jenkins restarts)
* Fixes a potential race condition where multiple triggers would attempt to set up hooks at the same time.
Not all possible improvements are included. When a new PR or updated PR event is sent to Jenkins, we could pull the GHPullRequest info for affected projects once, instead of for each project which we do today.
-Fixed the bug with inability to change the skip build phrase in a job. It now stores it properly. -Skip build phrase now checks in a pull request title as well as it's body. -Added DSL Support for skip build phrase.
Reduce API calls
Add option to avoid managing of webhooks
Adding functionality to not post commit status for children jobs
Add one-line test output option for upstream status
…multiple downstream jobs
Skip Build Phrase Fix and Improvements
When downstream jobs are triggered at the same time, the commit statuses overwrite each others
Check if skipBuild is empty or null
… back to the trigger
Remove adding parameters action from teh env contributor, and move it…
Set the parameters again
I fixed a bug in the Java Github API where it would always populate certain fields of the structure regardless of whether they had been pulled before (the case is unmerged PR). Doing so causes the mergeability check to fail because we will never pull new data. Instead, if the mergeability is null, grab the PR again. Alternatively, I think this functionality should be removed altogether. It's expensive and in most cases the build will immediately start and we will make another API to get the mergeability data again. I will file another PR for that.
Pull PR data if necessary when determining mergeability For some reason I was assuming that this call was calling out for live data.
Set the pull request after updating the updated timestamp
…-name update 'mergeGithubPullRequest' to 'mergePullRequest' in Job DSL sect…
Fix NullPointerException
Grab the envVars from the run
GetCommentsCount always returns 0 so comments never work
|
Can one of the admins verify this patch? |
2 similar comments
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a new checkbox parameter to the merger post build action so that merging works without a trigger phrase if desired.