From: Jordan Petridis <jordan@centricular.com>
Date: Tue, 6 Jun 2023 12:45:24 +0000 (+0300)
Subject: ci: Only run the Flatpak jobs if there's REPO_TOKEN set in the repo
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57f040d5e82f2a8c4bf16f178ea33d657700a204;p=thirdparty%2Fvala.git

ci: Only run the Flatpak jobs if there's REPO_TOKEN set in the repo

REPO_TOKEN is the authentication token to publish to the Nightly
flatpak repository.

And overwrite the publish_nightly rules again, since we need
to append them to only run on schedules.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3542f980..35e3426fa 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_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_BRANCH == "main" && $REPO_TOKEN && ($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']
+  extends: ['.publish_nightly', ".flatpak rules"]
   needs: ['flatpak-extension@x86_64']
 
 nightly@aarch64:
-  extends: ['.publish_nightly']
+  extends: ['.publish_nightly', ".flatpak rules"]
   needs: ['flatpak-extension@aarch64']