diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-19 23:47:05 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-19 23:47:05 +0300 |
| commit | 0c39f1f537c0974930a13e480b6888a5f315c053 (patch) | |
| tree | 7dd7b227acd853ed3b008755227a2edc33918952 /scripts | |
| parent | 6407d27000c46772cee9bb09491386a059c333ab (diff) | |
[ci] Fix OSX package builds to only be timer-triggered on master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci/pipeline/osx-package.groovy | 8 | ||||
| -rw-r--r-- | scripts/ci/pipeline/sdks-archive.groovy | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy index c24c60176ec..9fc2832f3e5 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -11,8 +11,14 @@ def utils = null if (monoBranch == 'master') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now - pipelineTriggers([cron('H H(0-3) * * *')]) + pipelineTriggers([cron('0 3 * * *')]) ]) + + // multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered + if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').isEmpty()) { + echo "Skipping per-commit build on master." + return + } } try { diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index a41f8beb6fb..ee821f4045a 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -4,8 +4,14 @@ def jobName = (isPr ? "archive-mono-pullrequest" : "archive-mono") if (monoBranch == 'master') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now - pipelineTriggers([cron('H H(0-3) * * *')]) + pipelineTriggers([cron('0 3 * * *')]) ]) + + // multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered + if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').isEmpty()) { + echo "Skipping per-commit build on master." + return + } } parallel ( |