Merge pull request #32 from joejstuart/master

return merged sha
openshift · Dec 7, 2018 · b3eff0a · b3eff0a
2 parents 36171d9 + 05151ef
commit b3eff0a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/org/centos/contra/pipeline/GitHubAPI.groovy b/src/org/centos/contra/pipeline/GitHubAPI.groovy
@@ -27,21 +27,22 @@ class GitHubAPI implements Serializable {
     def mergePRByNumber(def prNumber, String mergeMsg) {
         GHPullRequest ghPullRequest = getRepo().getPullRequest(prNumber)
         ghPullRequest.merge(mergeMsg)
+        GHPullRequest ghPullRequestMerged = getRepo().getPullRequest(prNumber)
 
-        return ghPullRequest.getMergeCommitSha()
+        return ghPullRequestMerged.getMergeCommitSha()
     }
 
     def rebasePRByNumber(def prNumber) {
         GHPullRequest ghPullRequest = getRepo().getPullRequest(prNumber)
         ghPullRequest.merge(null, null, GHPullRequest.MergeMethod.REBASE)
+        GHPullRequest ghPullRequestMerged = getRepo().getPullRequest(prNumber)
 
-        return ghPullRequest.getMergeCommitSha()
+        return ghPullRequestMerged.getMergeCommitSha()
     }
 
-    def rebasePR(GHPullRequest ghPullRequest) {
+    void rebasePR(GHPullRequest ghPullRequest) {
         ghPullRequest.merge(null, null, GHPullRequest.MergeMethod.REBASE)
 
-        return ghPullRequest.getMergeCommitSha()
     }
 
     def getRepo() {