From 26adf835cac8910cefe747912bcde4d2a06ebb63 Mon Sep 17 00:00:00 2001
From: anthorob <tony@bobert.me>
Date: Sun, 16 Nov 2025 01:36:01 -0500
Subject: [PATCH] rules

---
 .gitlab-ci.yml      | 6 ++++++
 java/.gitlab-ci.yml | 4 ----
 php/.gitlab-ci.yml  | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad2a61d..820ce14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,12 @@ variables:
   FQ_IMAGE_NAME: "$CI_REGISTRY_IMAGE"
   BUILDAH_NO_PROMPT: "1"
 
+workflow:
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "schedule"'
+      when: always
+    - when: never
+
 stages:
   - build
 
diff --git a/java/.gitlab-ci.yml b/java/.gitlab-ci.yml
index ab00b91..93b67b3 100644
--- a/java/.gitlab-ci.yml
+++ b/java/.gitlab-ci.yml
@@ -5,10 +5,6 @@
     - buildah bud --storage-driver=${STORAGE_DRIVER} --pull -t ${FQ_IMAGE_NAME}:java${JAVA_VERSION} -f java/Dockerfile.java${JAVA_VERSION} .
     - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
     - buildah push ${FQ_IMAGE_NAME}:java${JAVA_VERSION}
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-    - when: never
 
 build_java21:
   <<: *build_template
diff --git a/php/.gitlab-ci.yml b/php/.gitlab-ci.yml
index 2112a05..bb8ad20 100644
--- a/php/.gitlab-ci.yml
+++ b/php/.gitlab-ci.yml
@@ -5,10 +5,6 @@
     - buildah bud --storage-driver=${STORAGE_DRIVER} --pull -t ${FQ_IMAGE_NAME}:php${PHP_VERSION} -f php/Dockerfile.php${PHP_VERSION} .
     - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
     - buildah push ${FQ_IMAGE_NAME}:php${PHP_VERSION}
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-    - when: never
 
 build_php82:
   <<: *build_template