diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-03-23 23:17:54 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-03-23 23:20:45 +0300 |
commit | 24f07752ac8b43f94808e4042eeb0cfa3f716431 (patch) | |
tree | 192474c144011598ac47b287633bd7bf5c2d116c /scripts | |
parent | 8fd4258c48ef49c3fed596eede8ac5b4e338d577 (diff) |
Run only one concurrent sdks archive and osx pgk build on main in CI
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, 2 insertions, 14 deletions
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy index 4a4ce0e350f..b362bbb7df6 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -11,14 +11,8 @@ utils = null if (monoBranch == 'main') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now - pipelineTriggers([cron('0 3 * * *')]) + disableConcurrentBuilds() ]) - - // multi-branch pipelines still get triggered for each commit, skip these builds on main 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) { - echo "Skipping per-commit build on main." - return - } } try { diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index 69f148595ff..f6177b426e5 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -4,14 +4,8 @@ jobName = env.JOB_NAME.split('/').first() if (monoBranch == 'main') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now - pipelineTriggers([cron('0 3 * * *')]) + disableConcurrentBuilds() ]) - - // multi-branch pipelines still get triggered for each commit, skip these builds on main 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) { - echo "Skipping per-commit build on main." - return - } } parallel ( |