Branch: refs/heads/master
Home: https://github.com/jenkinsci/github-branch-source-plugin
Commit: 019cb082c1e2c3c0ffe160ee38f65712907ce9ad
https://github.com/jenkinsci/github-branch-source-plugin/commit/019cb082c1e2c3c0ffe160ee38f65712907ce9ad
Author: Liam Newman <bitwise...@gmail.com>
Date: 2019-05-22 (Wed, 22 May 2019)
Changed paths:
M
src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMFileSystem.java
M
src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
M
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevision.java
M
src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMFileSystemTest.java
M
src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTest.java
M
src/test/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevisionTest.java
Log Message:
-----------
[JENKINS-57371] - Enable graceful fallback for merge hash
We tried using strict merge commit handling to prevent cloning on master.
This resulted in some edge cases for some users where PRs would simply not build
and there was not viable workaround.
Change:
* Merge hash has been changed to best effort. If it is missing or inconsistent,
Jenkins will gracefully revert to cloning on master.
* Most validity checking for merge hash has been moved to create time.
* Plugin tries harder than before to create a valid merge hash revision.
Commit: 257a6281c751824bb94855d893152cc7d9b2e4ff
https://github.com/jenkinsci/github-branch-source-plugin/commit/257a6281c751824bb94855d893152cc7d9b2e4ff
Author: Liam Newman <bitwise...@gmail.com>
Date: 2019-05-22 (Wed, 22 May 2019)
Changed paths:
M
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevision.java
M
src/test/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevisionTest.java
Log Message:
-----------
JENKINS-57583 Ignore merge commmit when comparing revisions
Other plugins assume that there are are only two revisions
involved in PR revision identity. Since the mergeHash is generated
based on the base and source hashes, it is not particularly
interesting to use it and can cause bad behavior if we do.
The only place where the mergeHash is interesting is when
getting Jenkinsfile or doing readTrusted. It is an optimization
that should have as few side effects as possible.
Commit: 226406f21577ab0f377144bd1ca70b250f16fad3
https://github.com/jenkinsci/github-branch-source-plugin/commit/226406f21577ab0f377144bd1ca70b250f16fad3
Author: Liam Newman <bitwise...@gmail.com>
Date: 2019-05-23 (Thu, 23 May 2019)
Changed paths:
M
src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
Log Message:
-----------
Merge branch 'master' into JENKINS-57583
Commit: fdd3c0f13ab68551a545677bfc9c8bb6dedf03b9
https://github.com/jenkinsci/github-branch-source-plugin/commit/fdd3c0f13ab68551a545677bfc9c8bb6dedf03b9
Author: Liam Newman <bitwise...@gmail.com>
Date: 2019-05-23 (Thu, 23 May 2019)
Changed paths:
M
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevision.java
M
src/test/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevisionTest.java
Log Message:
-----------
Merge pull request #227 from bitwiseman/JENKINS-57583
JENKINS-57583 Ignore merge commmit when comparing revisions
Compare:
https://github.com/jenkinsci/github-branch-source-plugin/compare/ea479ae6f6d6...fdd3c0f13ab6
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/github-branch-source-plugin/push/refs/heads/master/ea479a-fdd3c0%40github.com.
For more options, visit https://groups.google.com/d/optout.
