From b68dacec622071d18cad90bbb11377aead3f80c9 Mon Sep 17 00:00:00 2001
From: Chris <galdarian@gmail.com>
Date: Thu, 14 Nov 2024 14:48:37 +1100
Subject: [PATCH] Setting Linux & Windows amd64 builds to compile on MR

---
 .gitlab-ci.yml | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72437220..8bf9b935 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,22 @@
 #-----------------------------------------------------------------------#
 # OpenRGB GitLab CI Configuration                                       #
 #-----------------------------------------------------------------------#
-.default_rules:
+.fork_local_runner_rules:
+  rules:
+  - if: $CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB" || $CI_PIPELINE_SOURCE == "push"
+    when: on_success
+
+.fork_gitlab_runner_rules:
+  rules:
+  - if: $CI_PROJECT_PATH != "CalcProgrammer1/OpenRGB" && $CI_PIPELINE_SOURCE == "push"
+    when: manual
+    allow_failure: true
+
+.upstream_rules:
   rules:
   - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
     when: on_success
-  - if: $CI_PIPELINE_SOURCE == "push"
-    when: manual
-    allow_failure: true
+  - !reference [.fork_gitlab_runner_rules, rules]
 
 .shared_windows_runners:
   tags:
@@ -56,7 +65,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (AppImage) i386 Build Target                                    #
@@ -81,7 +90,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (AppImage) amd64 Build Target                                   #
@@ -109,7 +118,7 @@ before_script:
 "Linux amd64 AppImage":
   extends: "Linux amd64 AppImage Base"
   rules:
-    - !reference [.default_rules, rules]
+  - !reference [.fork_local_runner_rules, rules]
   tags:
   - linux
   - amd64
@@ -117,9 +126,7 @@ before_script:
 "Linux amd64 AppImage (gitlab.com runner)":
   extends: "Linux amd64 AppImage Base"
   rules:
-  - if: $CI_PROJECT_PATH != "CalcProgrammer1/OpenRGB" && $CI_PIPELINE_SOURCE == "push"
-    when: manual
-    allow_failure: true
+  - !reference [.fork_gitlab_runner_rules, rules]
   tags:
   - "saas-linux-small-amd64"
 
@@ -146,7 +153,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (AppImage) arm64 Build Target                                   #
@@ -171,7 +178,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bookworm i386 Build Target                        #
@@ -199,7 +206,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bookworm amd64 Build Target                       #
@@ -227,7 +234,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bookworm armhf Build Target                       #
@@ -255,7 +262,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bookworm arm64 Build Target                       #
@@ -283,7 +290,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Linux (.rpm, F40) 64-bit Build Target                                 #
@@ -314,7 +321,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Debian i386 Bookworm test                                             #
@@ -467,7 +474,7 @@ before_script:
     expire_in: 30 days
 
   rules:
-    - !reference [.default_rules, rules]
+    - !reference [.upstream_rules, rules]
 
 #-----------------------------------------------------------------------#
 # Windows (64-bit) Build Target                                         #
@@ -548,16 +555,14 @@ before_script:
 "Windows 64":
   extends: "Windows 64 Base"
   rules:
-    - !reference [.default_rules, rules]
+  - !reference [.fork_local_runner_rules, rules]
 
 "Windows 64 (gitlab.com runner)":
   extends: "Windows 64 Base"
   before_script:
     choco install visualstudio2019-workload-vctools -y # gitlab provides vs2022, so add vs2019
   rules:
-  - if: $CI_PROJECT_PATH != "CalcProgrammer1/OpenRGB" && $CI_PIPELINE_SOURCE == "push"
-    when: manual
-    allow_failure: true
+  - !reference [.fork_gitlab_runner_rules, rules]
   tags:
   - "saas-windows-medium-amd64"