From 8c85a3143f67c59d79fcc637b70d79ac5a3e89dd Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 24 Oct 2022 21:58:52 +0300 Subject: [PATCH] ci: Allow the documentation job to always run post-merge We want the docs to be deployed on every post-merge pipeline on the main branch. In order to do that however we have to also have the fedora build job always running. This won't affect the documentation job run by MRs. Part-of: --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d08078fb46..24d671303c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,8 +130,7 @@ fedora amd64 docker: - '.fedora image' - '.fdo.container-build@fedora' stage: 'preparation' - needs: - - "trigger" + needs: [] tags: - 'packet.net' @@ -702,7 +701,6 @@ documentation: extends: - '.documentation' needs: - - "trigger" - "fedora amd64 docker" rules: - if: '$CI_PROJECT_NAMESPACE == "gstreamer" && $CI_COMMIT_BRANCH == "main"'