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>
This commit is contained in:
Jordan Petridis 2020-11-19 16:59:01 +02:00 committed by Marge Bot
parent c78b03bd50
commit 6f380114be

View File

@ -30,10 +30,19 @@ stages:
dnf clean all dnf clean all
workflow:
rules:
- if: '$CI_MERGE_REQUEST_IID'
- if: '$CI_COMMIT_TAG'
- if: '$CI_COMMIT_BRANCH'
.only_default: &only_default .only_default: &only_default
only: rules:
- merge_requests - 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: build-fedora-container:
extends: extends:
@ -58,7 +67,6 @@ check-commit-log:
- commit-message-junit-report.xml - commit-message-junit-report.xml
reports: reports:
junit: commit-message-junit-report.xml junit: commit-message-junit-report.xml
<<: *only_default
build-mutter: build-mutter:
extends: extends:
@ -74,7 +82,6 @@ build-mutter:
expire_in: 1 day expire_in: 1 day
paths: paths:
- build - build
<<: *only_default
build-without-opengl-and-glx: build-without-opengl-and-glx:
extends: extends:
@ -89,7 +96,6 @@ build-without-opengl-and-glx:
artifacts: artifacts:
paths: paths:
- build/meson-logs - build/meson-logs
<<: *only_default
build-without-native-backend-and-wayland: build-without-native-backend-and-wayland:
extends: extends:
@ -104,7 +110,6 @@ build-without-native-backend-and-wayland:
artifacts: artifacts:
paths: paths:
- build/meson-logs - build/meson-logs
<<: *only_default
test-mutter: test-mutter:
extends: extends:
@ -130,7 +135,6 @@ test-mutter:
when: always when: always
paths: paths:
- build - build
<<: *only_default
test-mutter-coverage: test-mutter-coverage:
extends: extends:
@ -147,7 +151,6 @@ test-mutter-coverage:
paths: paths:
- build/meson-logs/coveragereport - build/meson-logs/coveragereport
coverage: '/^TOTAL.*\s+(\d+\%)$/' coverage: '/^TOTAL.*\s+(\d+\%)$/'
<<: *only_default
can-build-gnome-shell: can-build-gnome-shell:
extends: extends:
@ -163,4 +166,3 @@ can-build-gnome-shell:
- .gitlab-ci/checkout-gnome-shell.sh - .gitlab-ci/checkout-gnome-shell.sh
- meson gnome-shell gnome-shell/build --prefix /usr -Dman=false - meson gnome-shell gnome-shell/build --prefix /usr -Dman=false
- ninja -C gnome-shell/build install - ninja -C gnome-shell/build install
<<: *only_default