summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2022-10-24 21:58:52 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2022-10-27 17:45:06 +0000
commit8c85a3143f67c59d79fcc637b70d79ac5a3e89dd (patch)
tree41a79469502222dc614cb65da3e2bebb6a1ef586 /.gitlab-ci.yml
parent04a23703738ed012b1ab0998ff999eaf99c7af4e (diff)
downloadgstreamer-8c85a3143f67c59d79fcc637b70d79ac5a3e89dd.tar.gz
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3258>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 1 insertions, 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"'