diff options
| author | Jordan Petridis <jpetridis@gnome.org> | 2020-11-19 16:59:01 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2020-11-20 07:12:25 +0000 |
| commit | 6f380114bec227837102be5a31bf9b3df75c9f08 (patch) | |
| tree | 0b47e7ba256f581fdc5f63407f1189a671950c9e /.gitlab-ci.yml | |
| parent | c78b03bd50783983e9d0e75882bc8565c42ed509 (diff) | |
| download | mutter-6f380114bec227837102be5a31bf9b3df75c9f08.tar.gz | |
ci: Replace only/except with rules
only/except keywords where deperecated in favor of rules.
Since we started using GNOME/mutter!1525 it introduced
a second pipeline being run for each commit.
Detached pipelines are the only way to access CI_MERGE_REQUEST_*
variables, and if we disable normal pipelines you will need to
create wip/spam MRs in order to run the tests.
This reworked rules makes it so, the normal pipeline needs manual
interaction to be started, and the detached/MR pipleines is always
run.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1578>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2a424c75..796030112 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,10 +30,19 @@ stages: dnf clean all +workflow: + rules: + - if: '$CI_MERGE_REQUEST_IID' + - if: '$CI_COMMIT_TAG' + - if: '$CI_COMMIT_BRANCH' + .only_default: &only_default - only: - - merge_requests - - /^.*$/ + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_TAG' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/' + - when: 'manual' build-fedora-container: extends: @@ -58,7 +67,6 @@ check-commit-log: - commit-message-junit-report.xml reports: junit: commit-message-junit-report.xml - <<: *only_default build-mutter: extends: @@ -74,7 +82,6 @@ build-mutter: expire_in: 1 day paths: - build - <<: *only_default build-without-opengl-and-glx: extends: @@ -89,7 +96,6 @@ build-without-opengl-and-glx: artifacts: paths: - build/meson-logs - <<: *only_default build-without-native-backend-and-wayland: extends: @@ -104,7 +110,6 @@ build-without-native-backend-and-wayland: artifacts: paths: - build/meson-logs - <<: *only_default test-mutter: extends: @@ -130,7 +135,6 @@ test-mutter: when: always paths: - build - <<: *only_default test-mutter-coverage: extends: @@ -147,7 +151,6 @@ test-mutter-coverage: paths: - build/meson-logs/coveragereport coverage: '/^TOTAL.*\s+(\d+\%)$/' - <<: *only_default can-build-gnome-shell: extends: @@ -163,4 +166,3 @@ can-build-gnome-shell: - .gitlab-ci/checkout-gnome-shell.sh - meson gnome-shell gnome-shell/build --prefix /usr -Dman=false - ninja -C gnome-shell/build install - <<: *only_default |