diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-23 11:27:53 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-23 11:27:53 +0300 |
commit | 3e7f130739673d68e0ff6ea28e69879bbc549f53 (patch) | |
tree | 2ebd80e803363389ee92615b4376c9eae31f5cf9 /scripts | |
parent | d46fa9b1e39bf2b4f5b5e3c4b8431331e81d3934 (diff) |
[ci] Make sure global variables are really global
Using "def" in groovy makes it local to the run() method.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ci/pipeline/osx-package.groovy | 20 | ||||
-rw-r--r-- | scripts/ci/pipeline/sdks-archive.groovy | 6 | ||||
-rw-r--r-- | scripts/ci/pipeline/win-package.groovy | 19 |
3 files changed, 23 insertions, 22 deletions
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy index da4f8ec9540..c6cbfec3544 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -1,13 +1,13 @@ -def isPrivate = (env.JENKINS_URL ==~ /.*jenkins\.internalx\.com.*/ ? true : false) -def isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) -def monoBranch = (isPr ? "pr" : env.BRANCH_NAME) -def isReleaseJob = (!isPr && monoBranch ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release -def jobName = (isPr ? "build-package-osx-mono-pullrequest" : isPrivate ? "build-package-osx-mono-private" : "build-package-osx-mono") -def windowsJobName = (isPr ? "build-package-win-mono-pullrequest" : isPrivate ? "build-package-win-mono-private/${monoBranch}" : "build-package-win-mono/${monoBranch}") -def isWindowsPrBuild = (isPr && env.ghprbCommentBody.contains("@monojenkins build pkg and msi")) -def packageFileName = null -def commitHash = null -def utils = null +isPrivate = (env.JENKINS_URL ==~ /.*jenkins\.internalx\.com.*/ ? true : false) +isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) +monoBranch = (isPr ? "pr" : env.BRANCH_NAME) +isReleaseJob = (!isPr && monoBranch ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release +jobName = (isPr ? "build-package-osx-mono-pullrequest" : isPrivate ? "build-package-osx-mono-private" : "build-package-osx-mono") +windowsJobName = (isPr ? "build-package-win-mono-pullrequest" : isPrivate ? "build-package-win-mono-private/${monoBranch}" : "build-package-win-mono/${monoBranch}") +isWindowsPrBuild = (isPr && env.ghprbCommentBody.contains("@monojenkins build pkg and msi")) +packageFileName = null +commitHash = null +utils = null if (monoBranch == 'master') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index d21a77b05a2..c0397964362 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -1,6 +1,6 @@ -def isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) -def monoBranch = (isPr ? "pr" : env.BRANCH_NAME) -def jobName = (isPr ? "archive-mono-pullrequest" : "archive-mono") +isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) +monoBranch = (isPr ? "pr" : env.BRANCH_NAME) +jobName = (isPr ? "archive-mono-pullrequest" : "archive-mono") if (monoBranch == 'master') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now diff --git a/scripts/ci/pipeline/win-package.groovy b/scripts/ci/pipeline/win-package.groovy index 2b48c204f5f..1aebe41b195 100644 --- a/scripts/ci/pipeline/win-package.groovy +++ b/scripts/ci/pipeline/win-package.groovy @@ -1,12 +1,13 @@ -def isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) -def monoBranch = (isPr ? "pr" : env.BRANCH_NAME) -def isReleaseJob = (!isPr && monoBranch ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release -def jobName = (isPr ? "build-package-win-mono-pullrequest" : "build-package-win-mono") -def macJobName = (isPr ? "build-package-osx-mono-pullrequest" : "build-package-osx-mono/${monoBranch}") -def packageFileNameX86 = null -def packageFileNameX64 = null -def commitHash = null -def utils = null +isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) +monoBranch = (isPr ? "pr" : env.BRANCH_NAME) +isReleaseJob = (!isPr && monoBranch ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release +jobName = (isPr ? "build-package-win-mono-pullrequest" : "build-package-win-mono") +macJobName = (isPr ? "build-package-osx-mono-pullrequest" : "build-package-osx-mono/${monoBranch}") +packageFileNameX86 = null +packageFileNameX64 = null +commitHash = null +utils = null + // compression is incompatible with JEP-210 right now properties([ /* compressBuildLog() */]) |