Quellcode durchsuchen

Fix condition in CI groovy scripts

Alexander Köplinger vor 4 Jahren
Ursprung
Commit
ce2515305e

+ 1 - 1
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
     }

+ 1 - 1
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
     }