From 78f43baa93f1d503ca7717f5d881b27bcbf45a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 20 Nov 2020 19:09:33 +0100 Subject: [PATCH] ci: Guard pipeline on review stage The first step is now review, as they use the tiny ci-fairy image, not our custom ones, so the guards should be on those, not the build step. Part-of: --- .gitlab-ci.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dac62e263..dfa5a0c65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,16 +66,6 @@ workflow: - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/' - when: 'manual' -build-fedora-container: - extends: - - .fdo.container-build@fedora@x86_64 - - .mutter.fedora:33 - stage: prepare - needs: - - check-commit-log - - check-merge-request - &pipline-guard - check-commit-log: extends: - .fdo.ci-fairy @@ -90,6 +80,7 @@ check-commit-log: - commit-message-junit-report.xml reports: junit: commit-message-junit-report.xml + <<: *pipline-guard check-merge-request: extends: @@ -108,6 +99,16 @@ check-merge-request: - check-merge-request-report.xml reports: junit: check-merge-request-report.xml + <<: *pipline-guard + +build-fedora-container: + extends: + - .fdo.container-build@fedora@x86_64 + - .mutter.fedora:33 + stage: prepare + needs: + - check-commit-log + - check-merge-request build-mutter: extends: