Skip to content
Snippets Groups Projects
Commit 5d00d3d91d86 authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

merge 0.10.x into default

No related branches found
No related tags found
No related merge requests found
Pipeline #24221 failed
......@@ -88,11 +88,7 @@
extends: .base
stage: upcoming
rules:
# we don't want to prevent merging unrelated work, so allow
# failures for normal builds
- if: '$CI_COMMIT_BRANCH'
allow_failure: true
# but disallow them for scheduled builds, so we get a nice
# disallow failures for scheduled builds, so we get a nice
# notification
- if: '$CI_PIPELINE_SOURCE == "schedule"'
allow_failure: false
......@@ -96,6 +92,14 @@
# notification
- if: '$CI_PIPELINE_SOURCE == "schedule"'
allow_failure: false
# but we don't want to prevent merging unrelated work, so allow
# failures for normal builds -- all of this is to avoid a detached
# build for merge requests
- if: '$CI_PIPELINE_SOURCE == "push"'
allow_failure: true
- if: '$CI_PIPELINE_SOURCE == "web"'
when: manual
allow_failure: true
parallel:
matrix:
- &development-versions
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment