diff options
| author | David Faure <faure@kde.org> | 2024-04-20 11:46:12 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2024-04-20 11:46:12 +0200 |
| commit | fb8bf14006c9186accc6e219b39bae3307d46421 (patch) | |
| tree | b669093d31b64040168d51d529aabea331af597f | |
| parent | 210b72f19d4aae28af2e3eea131aaadeec9b9c30 (diff) | |
Attempt to fix pipelines run after merges
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3462b8c..c0aa00e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,10 +35,13 @@ # These are used to make sure that we execute 'detached pipelines' on merge # requests. +# https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/540#note_2381171 workflow: rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH stages: - "Base container" |