From aa611d212825f2d2cb5a1e63edf00e63261f5a4a Mon Sep 17 00:00:00 2001
From: ZanderCowboy <zanderkotze99@gmail.com>
Date: Mon, 5 Feb 2024 00:33:46 +0000
Subject: [PATCH 1/6] enabled errors with super-linter

---
 .github/workflows/build_workflow.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
index ef4f1f14..1a335c31 100644
--- a/.github/workflows/build_workflow.yml
+++ b/.github/workflows/build_workflow.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
     branches:
       - "develop"
-  workflow_run: # this will get triggered on main branch only
+  workflow_run:
     workflows: ["Linting"]
     types:
       - completed
@@ -18,8 +18,6 @@ on:
 jobs:
   test:
     name: Test
-    # if: github.event.pull_request.draft == false
-    # uses: ./.github/workflows/_test_with_coverage.yml
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success'}}
     steps:
@@ -62,7 +60,7 @@ jobs:
           IGNORE_GITIGNORED_FILES: true
           FILTER_REGEX_EXCLUDE: "\\.freezed\\.dart$"
           CREATE_LOG_FILE: true
-          DISABLE_ERRORS: true
+          # DISABLE_ERRORS: true
 
       - run: echo "Analyzing completed."
 

From 6ca69cf3169470289dc4904049746e76db09a42b Mon Sep 17 00:00:00 2001
From: ZanderCowboy <zanderkotze99@gmail.com>
Date: Mon, 5 Feb 2024 00:42:35 +0000
Subject: [PATCH 2/6] test conditional job in build_workflow

---
 .github/workflows/build_workflow.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
index 1a335c31..74e3d7eb 100644
--- a/.github/workflows/build_workflow.yml
+++ b/.github/workflows/build_workflow.yml
@@ -19,7 +19,11 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success'}}
+    if: |
+      github.event_name == 'pull_request' && github.event.action == 'opened' && github.event.pull_request.base.ref == 'develop' ||
+      github.event.workflow_run.conclusion == 'success' &&
+      (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')
+    # if: ${{ github.event.workflow_run.conclusion == 'success'  }}
     steps:
       - run: echo "The triggering workflow 'Linting' passed and running tests"
       - run: echo "Tests completed."

From 80437345e1c1b58dfba9cb9291700ea62183c3cc Mon Sep 17 00:00:00 2001
From: ZanderCowboy <zanderkotze99@gmail.com>
Date: Mon, 5 Feb 2024 00:45:39 +0000
Subject: [PATCH 3/6] test conditional job in build_workflow

---
 .github/workflows/build_workflow.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
index 74e3d7eb..980ade0b 100644
--- a/.github/workflows/build_workflow.yml
+++ b/.github/workflows/build_workflow.yml
@@ -20,9 +20,9 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     if: |
-      github.event_name == 'pull_request' && github.event.action == 'opened' && github.event.pull_request.base.ref == 'develop' ||
-      github.event.workflow_run.conclusion == 'success' &&
-      (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')
+      ${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'develop'}} ||
+      ${{github.event.workflow_run.conclusion == 'success'}} &&
+      (${{github.ref == 'refs/heads/main'}} || ${{github.ref == 'refs/heads/develop'}})
     # if: ${{ github.event.workflow_run.conclusion == 'success'  }}
     steps:
       - run: echo "The triggering workflow 'Linting' passed and running tests"

From 754d53bbf03118b24a7d152fafa9aa110dbf7fdf Mon Sep 17 00:00:00 2001
From: ZanderCowboy <zanderkotze99@gmail.com>
Date: Mon, 5 Feb 2024 00:49:48 +0000
Subject: [PATCH 4/6] test conditional job in build_workflow

---
 .github/workflows/build_workflow.yml  | 6 +++---
 .github/workflows/deploy_workflow.yml | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
index 980ade0b..9bcdf9e2 100644
--- a/.github/workflows/build_workflow.yml
+++ b/.github/workflows/build_workflow.yml
@@ -20,9 +20,9 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     if: |
-      ${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'develop'}} ||
-      ${{github.event.workflow_run.conclusion == 'success'}} &&
-      (${{github.ref == 'refs/heads/main'}} || ${{github.ref == 'refs/heads/develop'}})
+      (${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'develop'}}) ||
+      (${{github.event.workflow_run.conclusion == 'success'}} &&
+      (${{github.ref == 'refs/heads/main'}} || ${{github.ref == 'refs/heads/develop'}}))
     # if: ${{ github.event.workflow_run.conclusion == 'success'  }}
     steps:
       - run: echo "The triggering workflow 'Linting' passed and running tests"
diff --git a/.github/workflows/deploy_workflow.yml b/.github/workflows/deploy_workflow.yml
index 0293562f..ea217170 100644
--- a/.github/workflows/deploy_workflow.yml
+++ b/.github/workflows/deploy_workflow.yml
@@ -19,6 +19,9 @@ jobs:
   predeploy:
     name: Pre-deploy
     runs-on: ubuntu-latest
+    if: |
+      (${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'main'}}) ||
+      (${{github.event.workflow_run.conclusion == 'success'}} && ${{github.ref == 'refs/heads/main'}})
     steps:
       - run: echo "Predeploy Job Finished"
   deploy:

From 8ca73753c1fbfd289a181171d9312eec083aa5e1 Mon Sep 17 00:00:00 2001
From: ZanderCowboy <zanderkotze99@gmail.com>
Date: Mon, 5 Feb 2024 00:56:17 +0000
Subject: [PATCH 5/6] test conditional job in deploy_workflow

---
 .github/workflows/deploy_workflow.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy_workflow.yml b/.github/workflows/deploy_workflow.yml
index ea217170..eb4fbf00 100644
--- a/.github/workflows/deploy_workflow.yml
+++ b/.github/workflows/deploy_workflow.yml
@@ -1,12 +1,12 @@
 ---
 name: Deploy Apps
 on:
-  # push:
-  #   branches:
-  #     - "main"
-  # pull_request:
-  #   branches:
-  #     - "main"
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
   workflow_run:
     workflows:
       - "Test, Analyze, Build"
@@ -19,9 +19,10 @@ jobs:
   predeploy:
     name: Pre-deploy
     runs-on: ubuntu-latest
-    if: |
-      (${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'main'}}) ||
-      (${{github.event.workflow_run.conclusion == 'success'}} && ${{github.ref == 'refs/heads/main'}})
+    if: ${{github.event.workflow_run.conclusion == 'success'}}
+    # if: |
+    #   (${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'main'}}) ||
+    #   (${{github.event.workflow_run.conclusion == 'success'}} && ${{github.ref == 'refs/heads/main'}})
     steps:
       - run: echo "Predeploy Job Finished"
   deploy:

From 62edf00c477cf53b782a121a66d9d069aafa9a88 Mon Sep 17 00:00:00 2001
From: ZanderCowboy <zanderkotze99@gmail.com>
Date: Mon, 5 Feb 2024 01:10:45 +0000
Subject: [PATCH 6/6] add dart build-runner

---
 .github/workflows/build_workflow.yml  | 3 +++
 .github/workflows/deploy_workflow.yml | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
index 9bcdf9e2..21d97840 100644
--- a/.github/workflows/build_workflow.yml
+++ b/.github/workflows/build_workflow.yml
@@ -51,6 +51,9 @@ jobs:
       - name: Flutter Get Dependencies
         run: flutter pub get
 
+      - name: Dart Build-runner
+        run: dart run build_runner build --delete-conflicting-outputs
+
       - name: ⚠️ℹ️ Run Dart analysis
         uses: zgosalvez/github-actions-analyze-dart@v3
         with:
diff --git a/.github/workflows/deploy_workflow.yml b/.github/workflows/deploy_workflow.yml
index eb4fbf00..3f6da725 100644
--- a/.github/workflows/deploy_workflow.yml
+++ b/.github/workflows/deploy_workflow.yml
@@ -16,20 +16,21 @@ on:
   # workflow_dispatch:
 
 jobs:
-  predeploy:
+  pre-deploy:
     name: Pre-deploy
     runs-on: ubuntu-latest
-    if: ${{github.event.workflow_run.conclusion == 'success'}}
+    if: github.event.workflow_run.conclusion == 'success'
     # if: |
     #   (${{github.event_name == 'pull_request'}} && ${{github.event.action == 'opened'}} && ${{github.event.pull_request.base.ref == 'main'}}) ||
     #   (${{github.event.workflow_run.conclusion == 'success'}} && ${{github.ref == 'refs/heads/main'}})
     steps:
       - run: echo "Predeploy Job Finished"
+
   deploy:
     name: Deploy Apps
     if: github.event.pull_request.draft == false
     uses: ./.github/workflows/_deploy-env-apps.yml
-    needs: predeploy
+    needs: pre-deploy
     permissions:
       contents: write
     secrets: inherit