From: Lorenz Wildberg <lorenz@wild-fisch.de>
Date: Tue, 30 May 2023 16:12:30 +0000 (+0000)
Subject: ci: Tweak the rules for the flatpak builds
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d64c62219a68305bb2afe5c7bc701cc01bf42bf9;p=thirdparty%2Fvala.git

ci: Tweak the rules for the flatpak builds

Make it possible to trigger manually if needed through the Web
UI and also drop the namespace and branch guard as there is only
one schedule and has to be set up explicitly anyway.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b26d0ee7a..f3542f980 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ include: "https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_
 
 .flatpak rules:
   rules:
-    - if: $CI_COMMIT_BRANCH == "main" && $CI_PROJECT_NAMESPACE == "gnome" && $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule"
 
 .vars-extension:
   extends: ".flatpak rules"
@@ -21,9 +21,9 @@ flatpak-extension@aarch64:
   extends: [".flatpak@aarch64", ".vars-extension"]
 
 nightly@x86_64:
-  extends: ['.publish_nightly', ".flatpak rules"]
+  extends: ['.publish_nightly']
   needs: ['flatpak-extension@x86_64']
 
 nightly@aarch64:
-  extends: ['.publish_nightly', ".flatpak rules"]
+  extends: ['.publish_nightly']
   needs: ['flatpak-extension@aarch64']