From 24d2b767a611af9c3041accc2489e48786732b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Wed, 2 Mar 2022 08:07:55 +0100
Subject: [PATCH] CI: Fix rules to keep running pipelines on master
Not doing so will eventually lead to issues with prebuilt contribs when
the pipeline doesn't run in the videolan/vlc namespace
---
extras/ci/gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 3b5b829f127c..516b77d38b27 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -118,8 +118,8 @@ variables:
.base-template:
stage: build
rules:
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master@videolan/vlc"'
+ - if: $CI_MERGE_REQUEST_IID
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_PATH == "videolan/vlc"'
artifacts:
paths:
- contrib/vlc-contrib-${TRIPLET}-*.tar.bz2
--
GitLab