From d565c61770bf04a79131340da8f99e4f112dcef9 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Wed, 14 Feb 2024 13:03:23 -0700
Subject: [PATCH] Fix rules "if" and add ability to run individual builds
 manually

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40a36da..70ede81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-linting:
+lint-dockerfiles:
   stage: test
   image: hadolint/hadolint:latest-alpine
   before_script:
@@ -27,7 +27,7 @@ test-debian:
     - docker pull $IMAGE_BASE/debian || true
     - docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian .
   rules:
-    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH_SLUG != "openlp/runners"
+    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners"
       changes:
         - Dockerfile.debian
 
@@ -37,7 +37,7 @@ test-ubuntu:
     - docker pull $IMAGE_BASE/ubuntu || true
     - docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu .
   rules:
-    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH_SLUG != "openlp/runners"
+    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners"
       changes:
         - Dockerfile.ubuntu
 
@@ -47,7 +47,7 @@ test-fedora:
     - docker pull $IMAGE_BASE/fedora || true
     - docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora .
   rules:
-    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH_SLUG != "openlp/runners"
+    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners"
       changes:
         - Dockerfile.fedora
 
@@ -57,7 +57,7 @@ test-arch:
     - docker pull $IMAGE_BASE/arch || true
     - docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch .
   rules:
-    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH_SLUG != "openlp/runners"
+    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners"
       changes:
         - Dockerfile.arch
 
@@ -67,7 +67,7 @@ test-angular:
     - docker pull $IMAGE_BASE/angular || true
     - docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular .
   rules:
-    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH_SLUG != "openlp/runners"
+    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners"
       changes:
         - Dockerfile.angular
 
@@ -77,7 +77,7 @@ test-documentation:
     - docker pull $IMAGE_BASE/documentation || true
     - docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation .
   rules:
-    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH_SLUG != "openlp/runners"
+    - if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners"
       changes:
         - Dockerfile.documentation
 
@@ -89,9 +89,10 @@ build-debian:
     - docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/debian:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners"
       changes:
         - Dockerfile.debian
+    - when: manual
 
 build-ubuntu:
   stage: build
@@ -101,9 +102,10 @@ build-ubuntu:
     - docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/ubuntu:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners"
       changes:
         - Dockerfile.ubuntu
+    - when: manual
 
 build-fedora:
   stage: build
@@ -113,9 +115,10 @@ build-fedora:
     - docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/fedora:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners"
       changes:
         - Dockerfile.fedora
+    - when: manual
 
 build-arch:
   stage: build
@@ -125,9 +128,10 @@ build-arch:
     - docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/arch:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners"
       changes:
         - Dockerfile.arch
+    - when: manual
 
 build-angular:
   stage: build
@@ -137,9 +141,10 @@ build-angular:
     - docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/angular:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners"
       changes:
         - Dockerfile.angular
+    - when: manual
 
 build-documentation:
   stage: build
@@ -149,9 +154,10 @@ build-documentation:
     - docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/documentation:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners"
       changes:
         - Dockerfile.documentation
+    - when: manual
 
 build-all:
   stage: build