diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-03-08 20:53:28 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-03-08 20:53:28 +0300 |
| commit | ce2515305ed1cb916e45a9b59c3734fdbf726b74 (patch) | |
| tree | 33ce547d742a3f84db9bd2720517c358cf2a1b55 /scripts | |
| parent | 4ad0520942b22658c252ac641cd78a0c22fb475a (diff) | |
Fix condition in CI groovy scripts
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci/pipeline/osx-package.groovy | 2 | ||||
| -rw-r--r-- | scripts/ci/pipeline/sdks-archive.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 18acfee2250..31d0a2ab15d 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -15,7 +15,7 @@ if (monoBranch == 'master') { ]) // multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered or manually triggered - if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() == 0 || currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause').size() == 0) { + if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() == 0 && currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause').size() == 0) { echo "Skipping per-commit build on master." return } diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index 799577b3173..260c843ab08 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -8,7 +8,7 @@ if (monoBranch == 'master') { ]) // multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered or manually triggered - if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() == 0 || currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause').size() == 0) { + if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() == 0 && currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause').size() == 0) { echo "Skipping per-commit build on master." return } |