diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-02-04 21:28:07 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-02-04 21:28:39 +0300 |
| commit | 05dc198dfc784e0f36849b4c067a5d37380c460c (patch) | |
| tree | 2985e79bcb8d9132b10a16488ba6c263f00d8c74 | |
| parent | 950644e9de7717e6d8e19dc646d61aa2c96ea568 (diff) | |
Treat 2020-02 as a valid release branch name too
This should give us breathing room until 2100-02 :)
(cherry picked from commit 44fe895ab093818bb2851e44776a5efe1ba3cb8f)
| -rw-r--r-- | scripts/ci/pipeline/osx-package.groovy | 2 | ||||
| -rw-r--r-- | scripts/ci/pipeline/win-package.groovy | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy index c6cbfec3544..7dc74e31221 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -1,7 +1,7 @@ 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 +isReleaseJob = (!isPr && monoBranch ==~ /20\d\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")) diff --git a/scripts/ci/pipeline/win-package.groovy b/scripts/ci/pipeline/win-package.groovy index 1aebe41b195..322831d7733 100644 --- a/scripts/ci/pipeline/win-package.groovy +++ b/scripts/ci/pipeline/win-package.groovy @@ -1,6 +1,6 @@ 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 +isReleaseJob = (!isPr && monoBranch ==~ /20\d\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 |