From 51942266bee37ae311b716fe18fb71a3fa608cfd Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 1 Jul 2025 16:13:22 +0530
Subject: [PATCH] ci: make it more robust and also reduce load on runners

---
 .gitlab-ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26523af0..848565a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 workflow:
   rules:
-    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule"
-
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH == "master"
+    - if: $CI_COMMIT_TAG
 stages:
   - prepare
   - build
@@ -14,11 +15,7 @@ variables:
 build-docker:
   image: docker:25.0.5-git
   stage: prepare
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH == "master"
-    - if: $CI_COMMIT_TAG
-    - when: manual
+
   tags:
     - generic_privileged
   variables:
@@ -34,8 +31,6 @@ build-docker:
 
 .build-cromite:
   image: $CONTAINER_IMAGE
-  rules:
-    - if: $CI_PIPELINE_SOURCE != "schedule"
   needs: ["build-docker"]
   tags:
     - build-browser
@@ -73,6 +68,10 @@ build-cromite-x64:
 .build-filters:
   image: debian:12-slim
   stage: filters
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_BRANCH == "master"
+    - when: manual
 
 update-filters:
   stage: filters
@@ -101,5 +100,3 @@ deploy_rsync:
     - apt-get update && apt-get install -y rsync openssh-client
   script:
     - rsync -avz --chown=$REMOTE_USER:www-data --chmod=F644 filters.dat $REMOTE_USER@$IMAGES_HOSTNAME:$BROWSER_PATH
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-- 
GitLab