From b21181a4468089a6934161c8bf3f3f3aa00525ec Mon Sep 17 00:00:00 2001
From: Chris Evich <chris_gitlab@icuc.me>
Date: Fri, 25 Nov 2022 23:26:35 -0500
Subject: [PATCH] Fix build job not running on main or tag push

Signed-off-by: Chris Evich <chris_gitlab@icuc.me>
---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42f64bd..75f5282 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,7 @@ envars:
 commit_check:
   stage: test
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS !~ /skip-ci/
-    - when: never
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   variables:
     BADRX: '^(squash!)|(fixup!)'
   script: |
@@ -42,6 +41,10 @@ commit_check:
 
 build:
   stage: deploy
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   variables:
     BUILDAH_FORMAT: docker
     BUILDAH_ISOLATION: chroot