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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
253 commits
Select commit Hold shift + click to select a range
bae619f
Fix ghprbTriggerAuthorLoginMention
arcivanov Jul 10, 2015
0e944a0
Merge branch 'master' into gituser_vars
arcivanov Jul 10, 2015
b4cdaed
Merge pull request #144 from janinko/master
DavidTanner Jul 10, 2015
2c399b0
Merge branch 'master' into gituser_vars
arcivanov Jul 11, 2015
8c85415
Extend the options in the merge step.
DavidTanner Jul 14, 2015
825b41d
Merge pull request #147 from jenkinsci/issue146
DavidTanner Jul 15, 2015
88c693b
[maven-release-plugin] prepare release ghprb-1.26
DavidTanner Jul 15, 2015
3909b22
[maven-release-plugin] prepare for next development iteration
DavidTanner Jul 15, 2015
410ec92
Fix null pointer when testing credentials
DavidTanner Jul 15, 2015
4d62ba4
[maven-release-plugin] prepare release ghprb-1.26.1
DavidTanner Jul 15, 2015
d364b4c
[maven-release-plugin] prepare for next development iteration
DavidTanner Jul 15, 2015
c7bc0e9
Use failOnError setting
DavidTanner Jul 15, 2015
0954f34
[maven-release-plugin] prepare release ghprb-1.26.2
DavidTanner Jul 15, 2015
ce547bf
[maven-release-plugin] prepare for next development iteration
DavidTanner Jul 15, 2015
2022752
Merge pull request #136 from arcivanov/gituser_vars
DavidTanner Jul 27, 2015
9f6a588
[JENKINS-29850] Add author github repo URL
aduprat Aug 7, 2015
cf6271b
Allow multiline for regex. Trigger is regex. Add description.
DavidTanner Aug 12, 2015
dbb1051
Merge pull request #157 from jenkinsci/pr105-is151
DavidTanner Aug 14, 2015
aeb85d4
Update readme.
DavidTanner Aug 14, 2015
c36f4df
[maven-release-plugin] prepare release ghprb-1.27
DavidTanner Aug 14, 2015
c875ec2
[maven-release-plugin] prepare for next development iteration
DavidTanner Aug 14, 2015
6dcf06a
Fixing NPE and non-sensical behavior of the GHPRB
arcivanov Aug 16, 2015
3eaa8b8
Fix unit tests to comply with new behavior
arcivanov Aug 16, 2015
b2dab2f
Remove onlyTriggerPhrase option, trigger-phrase-only behavior is now …
arcivanov Aug 19, 2015
9470f35
JENKINS-30115 Allow downstream jobs to attach GitHub status messages …
kevinsuwala Aug 24, 2015
df597e0
Rename LICENCE to LICENSE
p0deje Sep 7, 2015
aa97120
Merge pull request #169 from p0deje/license
DavidTanner Sep 7, 2015
a3bd987
Use the correct SHA1 for Matrix builds
emanuelez Sep 9, 2015
7dad0b2
Add the matrix project dependency
emanuelez Sep 9, 2015
9495ea9
Include the needed classes
emanuelez Sep 9, 2015
faef845
Merge pull request #172 from emanuelez/matrix-correct-sha1
DavidTanner Sep 9, 2015
fffea6b
Fix global defaults.
DavidTanner Sep 9, 2015
e091c6d
Fix some formatting
DavidTanner Sep 9, 2015
f785f40
Merge branch 'defaults' into kevinsuwala-CustomStatus
DavidTanner Sep 10, 2015
8fa3e3d
Update to mimick current update format.
DavidTanner Sep 10, 2015
8edd0d2
Move to env variables for repo.
DavidTanner Sep 10, 2015
cb8447f
Allow to work with CSR protection
Sep 16, 2015
e3c04f0
Merge pull request #173 from DavidTanner/defaults
DavidTanner Sep 21, 2015
6849779
Merge branch 'issue_158' of https://github.com/arcivanov/ghprb-plugin…
DavidTanner Sep 21, 2015
47453af
Remove old constructor, add logger statements for own code
DavidTanner Sep 21, 2015
1b40569
Fixed #165
DavidTanner Sep 21, 2015
8c5988e
Replace newline chars in some env variables
DavidTanner Sep 21, 2015
7690154
Fix credentials list so it returns the selected value
DavidTanner Sep 21, 2015
ebbf9ec
Merge pull request #178 from DavidTanner/bug-fixes
DavidTanner Sep 22, 2015
ad97d1a
Merge pull request #159 from arcivanov/issue_158
DavidTanner Sep 22, 2015
ec438ff
Merge branch 'master' into arcivanov-issue_158
DavidTanner Sep 22, 2015
3cb9345
Merged in master and fixed conflict
DavidTanner Sep 22, 2015
3f90711
Merge pull request #329 from jenkinsci/master
DavidTanner Sep 22, 2015
75ec0d4
Add the repo URL.
DavidTanner Sep 22, 2015
f684bfe
use equals() and fix onBuildTriggered()
jlebon Sep 15, 2015
a890fe3
add support for disabling certain commit status updates
jlebon Sep 17, 2015
9a5c0f0
Merge pull request #180 from DavidTanner/kevinsuwala-CustomStatus
DavidTanner Sep 22, 2015
0198e3c
Merge pull request #181 from DavidTanner/arcivanov-issue_158
DavidTanner Sep 22, 2015
8c95871
Merge pull request #179 from DavidTanner/aduprat-JENKINS-29850
DavidTanner Sep 22, 2015
1889113
Merge pull request #176 from fbelzunc/JENKINS-30483
DavidTanner Sep 22, 2015
60c6b99
Merge with master and fix conflict
DavidTanner Sep 22, 2015
81e8b83
Refix issue with ==
DavidTanner Sep 22, 2015
bad9910
Merge pull request #183 from jenkinsci/jlebon-pr/fix-defaults
DavidTanner Sep 22, 2015
a132391
Update Readme
DavidTanner Sep 22, 2015
01710c7
[maven-release-plugin] prepare release ghprb-1.28
DavidTanner Sep 22, 2015
0a4aa1b
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 22, 2015
ddcf978
NPEs in 1.28
arcivanov Sep 22, 2015
4875533
Merge pull request #186 from arcivanov/issue_184
DavidTanner Sep 22, 2015
e730ece
More places for NPE error
DavidTanner Sep 22, 2015
2984d24
Merge pull request #187 from jenkinsci/moreNpe
DavidTanner Sep 23, 2015
e2feb7e
[maven-release-plugin] prepare release ghprb-1.28.1
DavidTanner Sep 23, 2015
984460f
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 23, 2015
038038b
Fix NPE due to inverted logic in GhprbUpstreamStatus.java
jlebon Sep 22, 2015
eb2aa4b
Make sure build was caused by ghprb before doing onEnvironmentSetup()
jlebon Sep 23, 2015
0c01d4f
Merge pull request #185 from jlebon/pr/fixes
DavidTanner Sep 23, 2015
9c62cc6
[maven-release-plugin] prepare release ghprb-1.28.2
DavidTanner Sep 23, 2015
955dbf6
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 23, 2015
70d7615
Fix credentialsId being null
DavidTanner Sep 23, 2015
d7b9118
use getters so we get empty string instead of null
DavidTanner Sep 23, 2015
90fa3d2
Remove unnecessary check
DavidTanner Sep 23, 2015
7ac76fe
Merge pull request #188 from jenkinsci/envVars
DavidTanner Sep 23, 2015
683cad0
[maven-release-plugin] prepare release ghprb-1.28.3
DavidTanner Sep 23, 2015
77ddcc1
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 23, 2015
628ae01
Don't create a commit status in onEnvironmentSetup()
jlebon Sep 23, 2015
268aed5
Reduce noise of webhook handling for many jobs
DavidTanner Sep 23, 2015
7bf4231
Merge pull request #189 from jlebon/pr/fix-started
DavidTanner Sep 23, 2015
e87cc06
Change comment to FINE level
DavidTanner Sep 23, 2015
808e908
Merge pull request #190 from jenkinsci/webhook
DavidTanner Sep 23, 2015
0ae773b
[maven-release-plugin] prepare release ghprb-1.28.4
DavidTanner Sep 23, 2015
2bc0ba6
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 23, 2015
0f5abf5
GhprbPullRequestMerge must NOT persist and serialize logger #192
arcivanov Sep 23, 2015
dc5812f
Merge pull request #193 from arcivanov/issue_192
arcivanov Sep 23, 2015
67b92d2
[maven-release-plugin] prepare release ghprb-1.28.5
arcivanov Sep 23, 2015
806fc21
[maven-release-plugin] prepare for next development iteration
arcivanov Sep 23, 2015
fdb2639
Save the trigger on start.
DavidTanner Sep 24, 2015
b9b2eeb
Merge pull request #196 from jenkinsci/trigger
DavidTanner Sep 24, 2015
159aa48
[maven-release-plugin] prepare release ghprb-1.28.6
DavidTanner Sep 24, 2015
5b2e8ad
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 24, 2015
adfe761
Revert "Reduce noise of webhook handling for many jobs"
arcivanov Sep 26, 2015
10071d5
Merge pull request #200 from jenkinsci/revert-190-webhook
arcivanov Sep 26, 2015
f34aaa4
Fix issues with authentication for hooks.
DavidTanner Sep 26, 2015
f4f9315
Add debug statement to demonstrate anonymous GitHub root
arcivanov Sep 26, 2015
4d4bcbb
Don't use job context when looking up creds for GitHub connections.
DavidTanner Sep 26, 2015
031dc33
Merge branch 'webhook' of github.com:jenkinsci/ghprb-plugin into webhook
DavidTanner Sep 26, 2015
1f6d783
Fix ownCode verification
arcivanov Sep 26, 2015
66acd94
initial work to remove the concurrent map if possible
DavidTanner Sep 23, 2015
8958210
Minimize the PullRequest object so the xml file isn't so huge
DavidTanner Sep 24, 2015
0ad0d9b
Fix formatting
DavidTanner Sep 24, 2015
a5713e3
Helper being transient the PRs MUST be reinitialized with it
arcivanov Sep 26, 2015
5bf4efc
Final cleanup
arcivanov Sep 26, 2015
ce2a164
Fix test errors, pending - fix tests not passing
arcivanov Sep 26, 2015
c4e04d2
Merge
DavidTanner Sep 27, 2015
939c0b6
Missed uploading fixed tests
DavidTanner Sep 27, 2015
202be79
Missed change to repo
DavidTanner Sep 27, 2015
037c5e6
Add comment about not using context
DavidTanner Sep 27, 2015
2dd6521
Replace magic number in test
DavidTanner Sep 28, 2015
ee3a3e7
Merge pull request #203 from DavidTanner/webhook
DavidTanner Sep 28, 2015
8d9bd0e
Update readme for release
DavidTanner Sep 28, 2015
d511efb
Merge pull request #338 from jenkinsci/master
DavidTanner Sep 28, 2015
1e1f2d3
Merge pull request #2 from jenkinsci/master
DavidTanner Sep 28, 2015
0a095ec
[maven-release-plugin] prepare release ghprb-1.29
DavidTanner Sep 28, 2015
c2f0273
[maven-release-plugin] prepare for next development iteration
DavidTanner Sep 28, 2015
2d8d31c
Prevent NPE when job started manually
Oct 10, 2015
89daac9
Merge pull request #213 from tIGO/npe
DavidTanner Oct 12, 2015
7fe9c37
Merge branch 'master' of github.com:DavidTanner/ghprb-plugin
DavidTanner Oct 12, 2015
b70d573
Use StringUtils for equals comparison, and add the old URL style if n…
DavidTanner Oct 12, 2015
223a968
Fix #212, Closes janinko/ghprb#341
DavidTanner Oct 12, 2015
e5b5205
Merge pull request #215 from DavidTanner/webhook
DavidTanner Oct 14, 2015
c2b5467
Merge pull request #214 from DavidTanner/url
DavidTanner Oct 14, 2015
dd82bbe
Update readme
DavidTanner Oct 14, 2015
349f4e9
[maven-release-plugin] prepare release ghprb-1.29.1
DavidTanner Oct 14, 2015
05bb5eb
[maven-release-plugin] prepare for next development iteration
DavidTanner Oct 14, 2015
d93a7a3
Fix configVersion to share latest value
DavidTanner Oct 14, 2015
0e91274
Merge pull request #217 from jenkinsci/config
DavidTanner Oct 14, 2015
6cc03ca
[maven-release-plugin] prepare release ghprb-1.29.2
DavidTanner Oct 14, 2015
b4ec713
[maven-release-plugin] prepare for next development iteration
DavidTanner Oct 14, 2015
5f6e6d4
first attempt at adding alternative JenkinsURL
abridgett Oct 20, 2015
a4be236
adjustments due to jenkinsUrl
abridgett Oct 20, 2015
2e46031
correct typo
abridgett Oct 21, 2015
6773808
Merge pull request #1 from jenkinsci/master
DavidTanner Oct 23, 2015
c74cd08
set shared secret in webhook
abridgett Oct 26, 2015
97d73e0
During init, we should check whether initGhRepository returns false
mmitche Oct 30, 2015
b40aab1
Merge pull request #225 from mmitche/fix-stack-overflow
DavidTanner Oct 30, 2015
6bbe759
[maven-release-plugin] prepare release ghprb-1.29.3
DavidTanner Oct 30, 2015
bcface5
[maven-release-plugin] prepare for next development iteration
DavidTanner Oct 30, 2015
9a11668
Merge pull request #224 from abridgett/feature/set_secret_in_webhook
DavidTanner Oct 30, 2015
73f3332
Merge PR with master
DavidTanner Oct 30, 2015
99d09a8
Merge pull request #226 from jenkinsci/abridgett-feature/jenkins_url_…
DavidTanner Oct 30, 2015
b7c3074
[maven-release-plugin] prepare release ghprb-1.29.4
DavidTanner Oct 30, 2015
d85a8f5
[maven-release-plugin] prepare for next development iteration
DavidTanner Oct 30, 2015
882bbd7
added Job DSL for GhprbTrigger
daspilker Nov 5, 2015
74d70eb
it's OK for a @DslExtensionMethod to throw an exception
daspilker Nov 5, 2015
8abdd4f
Merge pull request #355 from jenkinsci/master
DavidTanner Nov 5, 2015
68b97e2
Fix "No test results found" in Github build status
slaunay Nov 23, 2015
50a7132
Merge pull request #368 from slaunay/bugfix/no-test-results-found
DavidTanner Nov 23, 2015
520ca32
Merge pull request #232 from janinko/master
DavidTanner Nov 23, 2015
53f8e0f
Update readme for release
DavidTanner Nov 23, 2015
27a5da3
[maven-release-plugin] prepare release ghprb-1.29.5
DavidTanner Nov 23, 2015
cfd7343
[maven-release-plugin] prepare for next development iteration
DavidTanner Nov 23, 2015
789cee5
Fix typo
DavidTanner Nov 25, 2015
5134ded
[JENKINS-31827] Use default timeouts for URLConnections
olivergondza Dec 1, 2015
ca3b37a
Merge pull request #234 from olivergondza/socket-timeout
DavidTanner Dec 1, 2015
5aa9449
Merge pull request #2 from jenkinsci/master
DavidTanner Dec 1, 2015
426743c
Make sure there is always a commit-status
DavidTanner Dec 1, 2015
3746fdc
Merge pull request #236 from DavidTanner/fix-config
DavidTanner Dec 1, 2015
d104f87
[maven-release-plugin] prepare release ghprb-1.29.6
DavidTanner Dec 2, 2015
2c25dce
[maven-release-plugin] prepare for next development iteration
DavidTanner Dec 2, 2015
18e2355
[FIXED JENKINS-31827] Use github-api with explicit socket timeouts de…
olivergondza Dec 3, 2015
2e58f53
Fix logging in GhprbRootAction
AtkinsChang Dec 5, 2015
ed22ff1
Fix accept content type
AtkinsChang Dec 5, 2015
a53df95
Check the media type case-insensitively
AtkinsChang Dec 5, 2015
d924dee
Replace \r + " chars in addition in some env variables
pbouillet Dec 21, 2015
afc0789
Merge pull request #242 from pbouillet/replacechars
DavidTanner Dec 21, 2015
f4b5999
Merge pull request #239 from AtkinsChang/master
DavidTanner Dec 22, 2015
7d52cf1
Merge pull request #238 from olivergondza/socket-timeout
DavidTanner Dec 22, 2015
1bc26e1
Merge pull request #229 from daspilker/JENKINS-31214
DavidTanner Dec 22, 2015
66f14ce
Update readme and remove quoting of trigger phrase
DavidTanner Dec 22, 2015
dc7ae9b
[maven-release-plugin] prepare release ghprb-1.29.7
DavidTanner Dec 22, 2015
070f988
[maven-release-plugin] prepare for next development iteration
DavidTanner Dec 22, 2015
9a68cdd
Remove webhook code, and integrate into trigger and auth
DavidTanner Jan 7, 2016
bb69fb6
added Job DSL support for GhprbPullRequestMerge publisher
daspilker Jan 7, 2016
e75db21
added documentation for Job DSL syntax
daspilker Jan 7, 2016
ab983d4
Merge pull request #246 from daspilker/JENKINS-31214
DavidTanner Jan 7, 2016
f9b00a4
Update readme before release
DavidTanner Jan 8, 2016
f051159
[maven-release-plugin] prepare release ghprb-1.29.8
DavidTanner Jan 8, 2016
e83c345
[maven-release-plugin] prepare for next development iteration
DavidTanner Jan 8, 2016
41ebd05
Keep track of jobs that are using webhooks and refer to that instead …
DavidTanner Jan 12, 2016
e0d4423
Added Upstream commit statuses DSL for GHPRB
Jan 12, 2016
f27dbc9
Updated README for downstream commit status for GHPRB
Jan 12, 2016
acec5fe
Merge pull request #245 from DavidTanner/webhook
DavidTanner Jan 12, 2016
07748d6
Merge pull request #249 from Eriten/JENKINS-32375
DavidTanner Jan 14, 2016
48df079
Fixed NPE when no build result is set
devos50 Jan 15, 2016
04e2b77
Merge pull request #251 from devos50/upstream_completedstatus_fix
DavidTanner Jan 15, 2016
5935ebf
Work on cleaning out variables that aren't really needed.
DavidTanner Jan 22, 2016
08a2612
Add comments, and some caching of values we don't get for free
DavidTanner Jan 23, 2016
cb90183
Move PR lists down to the job configuration
DavidTanner Jan 23, 2016
c337729
Update tests to reflect cached email
DavidTanner Jan 23, 2016
bc3f35e
Add more tests and fix some bugs
DavidTanner Jan 23, 2016
679a4fe
Add some synchronization where needed and fix tests.
DavidTanner Jan 26, 2016
5fa2f76
finish save logic in trigger
DavidTanner Jan 26, 2016
19cedf8
Merge pull request #1 from DavidTanner/triggerPrList
DavidTanner Jan 26, 2016
d845e6a
Merge pull request #253 from DavidTanner/cleanup
DavidTanner Jan 26, 2016
13bc7fd
Update readme for next release
DavidTanner Jan 26, 2016
a4a5955
[maven-release-plugin] prepare release ghprb-1.30
DavidTanner Jan 26, 2016
dce405d
[maven-release-plugin] prepare for next development iteration
DavidTanner Jan 26, 2016
7e78264
Use message metadata to determine whether issue_comment is pull request
mmitche Jan 29, 2016
6d3f775
Move pull request state into the builds directory
DavidTanner Feb 1, 2016
661ec34
Fix issues where current PR status wasn't kept
DavidTanner Feb 1, 2016
da91395
Fix test for new architecture
DavidTanner Feb 2, 2016
f3311fd
Merge pull request #258 from mmitche/check-is-pull-request
DavidTanner Feb 2, 2016
59beaea
Merge pull request #259 from DavidTanner/persistance
DavidTanner Feb 2, 2016
65cadd8
Update readme for next release
DavidTanner Feb 2, 2016
e89a328
Fix version for patch bump
DavidTanner Feb 2, 2016
56296b3
[maven-release-plugin] prepare release ghprb-1.30.1
DavidTanner Feb 2, 2016
57ec5d1
[maven-release-plugin] prepare for next development iteration
DavidTanner Feb 2, 2016
466f769
Add a check to see if the base of a PR has changed
DavidTanner Feb 5, 2016
7fc283a
Merge pull request #387 from jenkinsci/master
DavidTanner Feb 5, 2016
41d3a9d
Move security around calls to triggers
DavidTanner Feb 8, 2016
dc6fa50
Fix test to account for new call to getBase
DavidTanner Feb 9, 2016
836e552
Remove lookup for previous build
DavidTanner Feb 9, 2016
f196b64
Merge pull request #262 from DavidTanner/base
DavidTanner Feb 9, 2016
1d6bbfa
Add build to the PR
DavidTanner Feb 9, 2016
e8ce666
Fix tests
DavidTanner Feb 9, 2016
ee006fd
Merge with master
DavidTanner Feb 10, 2016
d132fd1
Merge pull request #264 from DavidTanner/security
DavidTanner Feb 10, 2016
8d49751
Update readme for next release
DavidTanner Feb 10, 2016
ec1790e
Add synchronization
DavidTanner Feb 11, 2016
0df5759
Add sync and move the skipBuild check into tryBuild
DavidTanner Feb 11, 2016
1794d85
Merge pull request #266 from DavidTanner/sync
DavidTanner Feb 12, 2016
728e6c2
[maven-release-plugin] prepare release ghprb-1.30.2
DavidTanner Feb 12, 2016
18fe1f8
[maven-release-plugin] prepare for next development iteration
DavidTanner Feb 12, 2016
31ea36e
All getters should use get, and not is
DavidTanner Feb 13, 2016
0a40ef8
Merge pull request #268 from DavidTanner/fixGetters
DavidTanner Feb 14, 2016
840d30a
[maven-release-plugin] prepare release ghprb-1.30.3
DavidTanner Feb 14, 2016
be92de7
[maven-release-plugin] prepare for next development iteration
DavidTanner Feb 14, 2016
46e5df1
Fix NPE
mmitche Feb 18, 2016
cc54819
Merge pull request #271 from mmitche/fix-npe
DavidTanner Feb 19, 2016
6220ae1
[maven-release-plugin] prepare release ghprb-1.30.4
DavidTanner Feb 19, 2016
3a41717
[maven-release-plugin] prepare for next development iteration
DavidTanner Feb 19, 2016
9fc1058
Add a build step extension that executes when a new build is scheduled.
DavidTanner Feb 23, 2016
70c4cd7
Add some tests.
DavidTanner Feb 24, 2016
65088f9
Add the ignore global setting. This way if there is a global default…
DavidTanner Feb 24, 2016
da1a9d4
Rename methods to explain what is going on, schedule instead of start
DavidTanner Feb 24, 2016
dcf3b9a
Pull in Queue.item just to the extension.
DavidTanner Feb 24, 2016
f34441e
update 'githubPullRequest' to 'pullRequest' in Job DSL section
Feb 24, 2016
3f0a668
Fix NPE when last build has been deleted
Feb 25, 2016
d33d6d9
Merge pull request #278 from gjacquet/fix-npe
DavidTanner Feb 25, 2016
4f9830e
Merge pull request #273 from DavidTanner/cancels
DavidTanner Feb 25, 2016
c92a8d1
Merge pull request #276 from vdice/update-dsl-trigger-name
DavidTanner Feb 25, 2016
622c84a
Trigger should only be applicable to AbstractProject items
DavidTanner Feb 25, 2016
33bcf34
Merge pull request #279 from DavidTanner/npe
DavidTanner Feb 26, 2016
26c6310
[maven-release-plugin] prepare release ghprb-1.30.5
DavidTanner Feb 26, 2016
697b7a2
[maven-release-plugin] prepare for next development iteration
DavidTanner Feb 26, 2016
6f86b1a
Merge branch 'master' of github.com:jenkinsci/ghprb-plugin
DavidTanner Feb 26, 2016
d2e8caa
rebased and fixed conflicts
fgimenez Mar 18, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
144 changes: 144 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ For more details, see https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+re

### Credentials
* If you are using Enterprise GitHub set the server api URL in ``GitHub server api URL``. Otherwise leave there ``https://api.github.com``.
* Set the Jenkins URL if you need to override the default (e.g. it's behind a firewall)
* A GitHub API token or username password can be used for access to the GitHub API
* To setup credentials for a given GitHub Server API URL:
* Click Add next to the ``Credentials`` drop down
Expand Down Expand Up @@ -104,9 +105,152 @@ Make sure you **DON'T** have ``Prune remote branches before build`` advanced opt
#### Parameterized Builds
If you want to manually build the job, in the job setting check ``This build is parameterized`` and add string parameter named ``sha1`` with a default value of ``master``. When starting build give the ``sha1`` parameter commit id you want to build or refname (eg: ``origin/pr/9/head``).

### Job DSL Support

Since the plugin contains an extension for the Job DSL plugin to add DSL syntax for configuring the build trigger and
the pull request merger post-build action.

It is also possible to set Downstream job commit statuses when `displayBuildErrorsOnDownstreamBuilds()` is set in the
upstream job's triggers and downstreamCommitStatus block is included in the downstream job's wrappers.

Here is an example showing all DSL syntax elements:

```groovy
job('upstreamJob') {
scm {
git {
remote {
github('test-owner/test-project')
refspec('+refs/pull/*:refs/remotes/origin/pr/*')
}
branch('${sha1}')
}
}

triggers {
pullRequest {
admin('user_1')
admins(['user_2', 'user_3'])
userWhitelist('[email protected]')
userWhitelist(['[email protected]', '[email protected]'])
orgWhitelist('my_github_org')
orgWhitelist(['your_github_org', 'another_org'])
cron('H/5 * * * *')
triggerPhrase('OK to test')
onlyTriggerPhrase()
useGitHubHooks()
permitAll()
autoCloseFailedPullRequests()
displayBuildErrorsOnDownstreamBuilds()
whiteListTargetBranches(['master','test', 'test2'])
allowMembersOfWhitelistedOrgsAsAdmin()
extensions {
commitStatus {
context('deploy to staging site')
triggeredStatus('starting deployment to staging site...')
startedStatus('deploying to staging site...')
statusUrl('http://mystatussite.com/prs')
completedStatus('SUCCESS', 'All is well')
completedStatus('FAILURE', 'Something went wrong. Investigate!')
completedStatus('PENDING', 'still in progress...')
completedStatus('ERROR', 'Something went really wrong. Investigate!')
}
}
}
}
publishers {
mergeGithubPullRequest {
mergeComment('merged by Jenkins')
onlyAdminsMerge()
disallowOwnCode()
failOnNonMerge()
deleteOnMerge()
}
}
}

job('downstreamJob') {
wrappers {
downstreamCommitStatus {
context('CONTEXT NAME')
triggeredStatus("The job has triggered")
startedStatus("The job has started")
statusUrl()
completedStatus('SUCCESS', "The job has passed")
completedStatus('FAILURE', "The job has failed")
completedStatus('ERROR', "The job has resulted in an error")
}
}
}
```

### Updates

#### -> 1.30.2
* Don't run through all the builds for changelog, track it in the PR object instead
* Synchronization around the PR object fields

#### -> 1.30.1
* Moved pull request state into build/pullrequests directory.
* Dynamic state is no longer kept as part of the trigger
* Merged #258 ignore comments on issues that aren't pull requests

#### -> 1.30
* Merged #253, cleaning up code.
* WebHooks are refactored to be closer to the variables it depends on
* PR data is now local per job instead of global
* The config.xml is only saved when there is a change to a PR the job is watching
* GitHub connections are now shared.
* Shouldn't run into rate limits on startup
* Pull Requests are only updated when the trigger runs, instead of on startup.

#### -> 1.29.8
* Merged #246 adding job dsl features and updating docs

#### -> 1.29.7
* Remove quoting of trigger phrase
* Merged #242 replaces newline and quoted quotes
* Merged #229 Add job dsl
* Merged #238 Update github-api version

#### -> 1.29.5
* Merge #232 fixes erroneous no test cases found

#### -> 1.29.4
* Add secret when auto creating the web hook
* Accomodate Jenkins being behind a firewall
* Fix for recursive repo initializations.

#### -> 1.29.1
* Fix NPE for triggers without a project
* Add back default URL if env variables are missing

#### -> 1.29
* Reduced the size of the plugin .xml file drastically.
* Fixed issues with persistance store credentials.
* Reduced the noise caused by webhook logic, and reduced amount of work for webhooks

#### -> 1.28
* Fixed [JENKINS-29850] Add author github repo URL
* Fixed NPE and other errors in merge logic
* Removed only trigger phrase, trigger is expected always now
* Fixed [JENKINS-30115] Downstream jobs can now attach GitHub status messages
* Fixed SHA1 for Matrix builds
* Global defaults are now used if the local value isn't set.
* Fixed issues with CSR protection
* Commit updates can be skipped all together or individual steps can be skipped using --none--

#### -> 1.27
* Trigger is now a regex term
* Phrases are no matched agains multiple lines properly
* All regex patterns use ignore case and dotall
* Added variables to the parameters

#### -> 1.26
* Extend the checking for own code.
* Fail build only when desired if we can't merge the build.
* Add option to delete branch when merge succeeds.

#### -> 1.25
* Fix condition where admin can't run tests #60 JENKINS-25572, JENKINS-25574, JENKINS-25603
* Check for when webhook encoding is null and default to UTF-8
Expand Down
15 changes: 13 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<artifactId>ghprb</artifactId>
<name>GitHub Pull Request Builder</name>
<version>1.26-SNAPSHOT</version>
<version>1.30.6-SNAPSHOT</version>
<packaging>hpi</packaging>

<url>https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+request+builder+plugin</url>
Expand Down Expand Up @@ -50,10 +50,15 @@
<artifactId>github</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>github-api</artifactId>
<version>1.66</version>
<version>1.71</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -65,6 +70,12 @@
<artifactId>ssh-agent</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>job-dsl</artifactId>
<version>1.39</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Loading