saddler-reporter-support-git 2.0.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fe0678fb49fba7a7f54b803440fa91dbf7a844b4
|
|
4
|
+
data.tar.gz: c94d6b141aff88badcd2e6e5b3578a8938f629d2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 68613d9fc2edf703d3d13ab945a03be67c5eec7a35b7a3c64e30dc847e6053e3943081f7dd88c8279785eea209037b08dab909a57681699b26895c390a163c14
|
|
7
|
+
data.tar.gz: 8134383e7593be1c6c6ce07a7bb161a00be8eb7440c7a8148fe132c6fdea0dc0138947eadce13f2d599e109891724e27e08de59acc01a161697b1d93bd51c16f
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
<a name="2.0.1"></a>
|
|
2
|
+
## [2.0.1](https://github.com/packsaddle/ruby-saddler-reporter-support-git/compare/v2.0.0...v2.0.1) (2016-06-05)
|
|
3
|
+
|
|
4
|
+
* **repository:** Fix jenkins error: "commit_id is not part of the pull request"([3724bab](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/3724bab)), fixes [#44](https://github.com/packsaddle/ruby-saddler-reporter-support-git/pull/44)
|
|
5
|
+
|
|
6
|
+
|
|
1
7
|
<a name="2.0.0"></a>
|
|
2
8
|
# [2.0.0](https://github.com/packsaddle/ruby-saddler-reporter-support-git/compare/v1.0.0...v2.0.0) (2016-05-14)
|
|
3
9
|
|
|
@@ -63,8 +63,15 @@ module Saddler
|
|
|
63
63
|
# @return [::Git::Object] merging object
|
|
64
64
|
def merging_object
|
|
65
65
|
return head unless merge_commit?(head)
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
if ENV['ghprbActualCommit'] && !ENV['ghprbActualCommit'].empty?
|
|
67
|
+
# GitHub pull request builder plugin (for Jenkins)
|
|
68
|
+
commit = head.parents.select do |parent|
|
|
69
|
+
parent.sha == ENV['ghprbActualCommit']
|
|
70
|
+
end
|
|
71
|
+
else
|
|
72
|
+
commit = head.parents.select do |parent|
|
|
73
|
+
![dig_sha(tracking), dig_sha(origin_tracking)].compact.include?(parent.sha)
|
|
74
|
+
end
|
|
68
75
|
end
|
|
69
76
|
return commit.last if commit.count == 1
|
|
70
77
|
head # fallback
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: saddler-reporter-support-git
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.
|
|
4
|
+
version: 2.0.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- sanemat
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-05
|
|
11
|
+
date: 2016-06-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: git
|