From 55cb2f32db9bb1fcc8b81f7ed0f05725a8522978 Mon Sep 17 00:00:00 2001
From: Zehkira <9485872-zehkira@users.noreply.gitlab.com>
Date: Thu, 9 Oct 2025 10:38:52 +0200
Subject: [PATCH 1/4] Disable redundant tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82c0a9b..052b93c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ stages:
 test:
   stage: test
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: ($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $RELEASE_BRANCH)
   image: ${IMAGE}
   script:
     - apk add appstream bash desktop-file-utils flatpak flatpak-builder make ruff
-- 
GitLab


From 2f33b067fd99505d75f93ce6dad7a33a0ce22734 Mon Sep 17 00:00:00 2001
From: Zehkira <9485872-zehkira@users.noreply.gitlab.com>
Date: Thu, 9 Oct 2025 10:59:58 +0200
Subject: [PATCH 2/4] Rework CI

---
 .gitlab-ci.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 052b93c..8ea807d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,14 @@
 variables:
   APP_ID: io.gitlab.zehkira.Monophony
   RELEASE_BRANCH: release # Branch on which to build and deploy automatically
+  DEV_BRANCH: master # Main development branch into which feature branches are squashed and merged
   FLATPAK_BRANCH: master # Branch of exported flatpak repo, same as in flatpakref file
   IMAGE: alpine:3.22.1
 
 
 stages:
   - test
+  - validate-workflow
   - build-x86_64
   - build-aarch64
   - deploy
@@ -15,7 +17,7 @@ stages:
 test:
   stage: test
   rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $RELEASE_BRANCH)
+    - if: ($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $DEV_BRANCH)
   image: ${IMAGE}
   script:
     - apk add appstream bash desktop-file-utils flatpak flatpak-builder make ruff
@@ -28,6 +30,18 @@ test:
     - flatpak run --filesystem=$CI_PROJECT_DIR/source/tests/:ro --command=source/tests/tests.py --env=LOG_LEVELS=ERRO ${APP_ID}
 
 
+validate-workflow:
+  stage: validate-workflow
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  image: ${IMAGE}
+  script:
+    - if [ -z "$CI_MERGE_REQUEST_LABELS" ]; then (exit 1); fi
+    - if [ -z "$CI_MERGE_REQUEST_MILESTONE" ]; then (exit 1); fi
+    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = true ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "$RELEASE_BRANCH" ]; then (exit 1); fi
+    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = false ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "$DEV_BRANCH" ]; then (exit 1); fi
+
+
 .build:
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
-- 
GitLab


From 78bace79a3183ef4a760dbfca41acb1c5736ab51 Mon Sep 17 00:00:00 2001
From: Zehkira <9485872-zehkira@users.noreply.gitlab.com>
Date: Thu, 9 Oct 2025 11:09:42 +0200
Subject: [PATCH 3/4] Fix conditions

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ea807d..35ed6aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,10 +36,13 @@ validate-workflow:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   image: ${IMAGE}
   script:
+    - echo "$CI_MERGE_REQUEST_LABELS"
     - if [ -z "$CI_MERGE_REQUEST_LABELS" ]; then (exit 1); fi
+    - echo "$CI_MERGE_REQUEST_MILESTONE"
     - if [ -z "$CI_MERGE_REQUEST_MILESTONE" ]; then (exit 1); fi
-    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = true ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "$RELEASE_BRANCH" ]; then (exit 1); fi
-    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = false ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "$DEV_BRANCH" ]; then (exit 1); fi
+    - echo "$CI_MERGE_REQUEST_SQUASH_ON_MERGE $CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
+    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = true ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "${RELEASE_BRANCH}" ]; then (exit 1); fi
+    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = false ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "${DEV_BRANCH}" ]; then (exit 1); fi
 
 
 .build:
-- 
GitLab


From d5902cc67b933dd672833bb70ad74acd9ea5b835 Mon Sep 17 00:00:00 2001
From: Zehkira <9485872-zehkira@users.noreply.gitlab.com>
Date: Thu, 9 Oct 2025 11:17:31 +0200
Subject: [PATCH 4/4] Remove workflow validation stage

---
 .gitlab-ci.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35ed6aa..cf38c16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ variables:
 
 stages:
   - test
-  - validate-workflow
   - build-x86_64
   - build-aarch64
   - deploy
@@ -30,21 +29,6 @@ test:
     - flatpak run --filesystem=$CI_PROJECT_DIR/source/tests/:ro --command=source/tests/tests.py --env=LOG_LEVELS=ERRO ${APP_ID}
 
 
-validate-workflow:
-  stage: validate-workflow
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  image: ${IMAGE}
-  script:
-    - echo "$CI_MERGE_REQUEST_LABELS"
-    - if [ -z "$CI_MERGE_REQUEST_LABELS" ]; then (exit 1); fi
-    - echo "$CI_MERGE_REQUEST_MILESTONE"
-    - if [ -z "$CI_MERGE_REQUEST_MILESTONE" ]; then (exit 1); fi
-    - echo "$CI_MERGE_REQUEST_SQUASH_ON_MERGE $CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
-    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = true ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "${RELEASE_BRANCH}" ]; then (exit 1); fi
-    - if [ "$CI_MERGE_REQUEST_SQUASH_ON_MERGE" = false ] && [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "${DEV_BRANCH}" ]; then (exit 1); fi
-
-
 .build:
   rules:
     - if: $CI_COMMIT_BRANCH == $RELEASE_BRANCH
-- 
GitLab