From df6c469953d21669ee32a67b582ef7575b44e0f1 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <rubberduckie3554@gmail.com>
Date: Sat, 18 Feb 2023 16:42:18 -0500
Subject: Do the branch check as part of the script instead of using matrix
 tasks

---
 .cirrus.yml | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 725f4de5..a432525f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,29 +4,20 @@ task:
   name: Build - macOS Apple Silicon
   environment:
     GITLAB_TRIGGER_TOKEN: ENCRYPTED[!5fb4bbdecbde3b2c766ac7383dca573cd5ec8b815c5ac9bede0cadfe9ad70ecd3e64b1728f7840da087099f3fc1fd4f7!]
-  matrix:
-    - name: Homebrew
-      homebrew_Script: brew bundle --file .ci/macos/Brewfile
-    - name: Build
-      build_script:
-      - export PATH="$(brew --prefix qt5)/bin/:${PATH}"
-      - ./.ci/macos/build.sh
-    - name: Zip
-      depends_on:
-      - Build
-      zip_script:
-      - ditto -c -k --sequesterRsrc --keepParent build/nheko.app build/nheko.zip
-    - name: Gitlab
-      only_if: $CIRRUS_BRANCH == 'master'
-      depends_on:
-      - Zip
-      gitlab_script:
-        - curl -X POST
-          --fail
-          -F token="${GITLAB_TRIGGER_TOKEN}"
-          -F ref="${CIRRUS_BRANCH}"
-          -F "variables[TRIGGER_BUILD_ID]=${CIRRUS_BUILD_ID}"
-          -F "variables[TRIGGERED_BY]=cirrus"
-          "https://nheko.im/api/v4/projects/2/trigger/pipeline"
+  homebrew_script:
+    - brew bundle --file .ci/macos/Brewfile
+  build_script:
+    - export PATH="$(brew --prefix qt5)/bin/:${PATH}"
+    - ./.ci/macos/build.sh
+  zip_script:
+    - ditto -c -k --sequesterRsrc --keepParent build/nheko.app build/nheko.zip
+  gitlab_script:
+    - $CIRRUS_BRANCH == 'master' && curl -X POST
+        --fail
+        -F token="${GITLAB_TRIGGER_TOKEN}"
+        -F ref="${CIRRUS_BRANCH}"
+        -F "variables[TRIGGER_BUILD_ID]=${CIRRUS_BUILD_ID}"
+        -F "variables[TRIGGERED_BY]=cirrus"
+        "https://nheko.im/api/v4/projects/2/trigger/pipeline"
   binaries_artifacts:
-    path: build/nheko.zip  
\ No newline at end of file
+    path: build/nheko.zip
\ No newline at end of file
-- 
cgit v1.2.3