Skip to content

Commit

Permalink
add labels to sh calls
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Apr 27, 2020
1 parent 2249021 commit 8e0ed59
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions vars/workers.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,15 @@ def base(Map params, Closure closure) {

def mergeBase
if (env.ghprbTargetBranch) {
sh(script: "cd kibana && git fetch origin ${env.ghprbTargetBranch}")
mergeBase = sh(script: "cd kibana && git merge-base HEAD FETCH_HEAD", returnStdout: true).trim()
sh(
script: "cd kibana && git fetch origin ${env.ghprbTargetBranch}",
label: "update reference to target branch 'origin/${env.ghprbTargetBranch}'"
)
mergeBase = sh(
script: "cd kibana && git merge-base HEAD FETCH_HEAD",
label: "determining merge point with target branch 'origin/${env.ghprbTargetBranch}'"
returnStdout: true
).trim()
}

ciStats.reportGitInfo(
Expand Down

0 comments on commit 8e0ed59

Please sign in to comment.