From 880a6f17b845af045ea14e01f0c3d9c4a0a629d8 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 27 Mar 2022 21:02:50 +0200
Subject: [PATCH] Change Workflow dependency

---
 .github/workflows/action_branch.yml  | 42 ----------------------------
 .github/workflows/zzz-reuse-test.yml | 30 ++++++++++++++++----
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/action_branch.yml b/.github/workflows/action_branch.yml
index c0870e7..b7b60af 100644
--- a/.github/workflows/action_branch.yml
+++ b/.github/workflows/action_branch.yml
@@ -44,7 +44,6 @@ jobs:
   # -----------------------------------------------------------------------------------------------
   base:
     needs:
-      - params
       - configure
     uses: ./.github/workflows/zzz-reuse-build.yml
     with:
@@ -60,7 +59,6 @@ jobs:
 
   base-test:
     needs:
-      - params
       - configure
       - base
     uses: ./.github/workflows/zzz-reuse-test.yml
@@ -81,10 +79,8 @@ jobs:
   # -----------------------------------------------------------------------------------------------
   mods:
     needs:
-      - params
       - configure
       - base
-      - base-test
     uses: ./.github/workflows/zzz-reuse-build.yml
     with:
       enabled: true
@@ -99,10 +95,7 @@ jobs:
 
   mods-test:
     needs:
-      - params
       - configure
-      - base
-      - base-test
       - mods
     uses: ./.github/workflows/zzz-reuse-test.yml
     with:
@@ -122,12 +115,8 @@ jobs:
   # -----------------------------------------------------------------------------------------------
   prod:
     needs:
-      - params
       - configure
-      - base
-      - base-test
       - mods
-      - mods-test
     uses: ./.github/workflows/zzz-reuse-build.yml
     with:
       enabled: true
@@ -142,12 +131,7 @@ jobs:
 
   prod-test:
     needs:
-      - params
       - configure
-      - base
-      - base-test
-      - mods
-      - mods-test
       - prod
     uses: ./.github/workflows/zzz-reuse-test.yml
     with:
@@ -167,14 +151,8 @@ jobs:
   # -----------------------------------------------------------------------------------------------
   work:
     needs:
-      - params
       - configure
-      - base
-      - base-test
-      - mods
-      - mods-test
       - prod
-      - prod-test
     uses: ./.github/workflows/zzz-reuse-build.yml
     with:
       enabled: true
@@ -189,14 +167,7 @@ jobs:
 
   work-test:
     needs:
-      - params
       - configure
-      - base
-      - base-test
-      - mods
-      - mods-test
-      - prod
-      - prod-test
       - work
     uses: ./.github/workflows/zzz-reuse-test.yml
     with:
@@ -216,15 +187,10 @@ jobs:
   # -----------------------------------------------------------------------------------------------
   push-image:
     needs:
-      - params
       - configure
-      - base
       - base-test
-      - mods
       - mods-test
-      - prod
       - prod-test
-      - work
       - work-test
     uses: ./.github/workflows/zzz-reuse-deploy-images.yml
     with:
@@ -245,14 +211,6 @@ jobs:
     needs:
       - params
       - configure
-      - base
-      - base-test
-      - mods
-      - mods-test
-      - prod
-      - prod-test
-      - work
-      - work-test
       - push-image
     uses: ./.github/workflows/zzz-reuse-deploy-manifests.yml
     with:
diff --git a/.github/workflows/zzz-reuse-test.yml b/.github/workflows/zzz-reuse-test.yml
index 519fbbb..f8e1ee4 100644
--- a/.github/workflows/zzz-reuse-test.yml
+++ b/.github/workflows/zzz-reuse-test.yml
@@ -110,14 +110,14 @@ jobs:
             name: ${{ steps.set-artifact-name.outputs.base }}
           attempt_limit: 20
           attempt_delay: 10000
-        if: ${{ inputs.flavour == 'mods' }}
+        if: ${{ inputs.flavour == 'base' }}
 
       - name: "[Artifact Load] Import base"
         uses: cytopia/shell-command-retry-action@v0.1.2
         with:
           command: |
             make load INFILE=${{ steps.set-artifact-name.outputs.base }}
-        if: ${{ inputs.flavour == 'mods' }}
+        if: ${{ inputs.flavour == 'base' }}
 
       ###
       ### Download and import mods
@@ -130,14 +130,14 @@ jobs:
             name: ${{ steps.set-artifact-name.outputs.mods }}
           attempt_limit: 20
           attempt_delay: 10000
-        if: ${{ inputs.flavour == 'prod' }}
+        if: ${{ inputs.flavour == 'mods' }}
 
       - name: "[Artifact Load] Import mods"
         uses: cytopia/shell-command-retry-action@v0.1.2
         with:
           command: |
             make load INFILE=${{ steps.set-artifact-name.outputs.mods }}
-        if: ${{ inputs.flavour == 'prod' }}
+        if: ${{ inputs.flavour == 'mods' }}
 
       ###
       ### Download and import prod
@@ -150,13 +150,33 @@ jobs:
             name: ${{ steps.set-artifact-name.outputs.prod }}
           attempt_limit: 20
           attempt_delay: 10000
-        if: ${{ inputs.flavour == 'work' }}
+        if: ${{ inputs.flavour == 'prod' }}
 
       - name: "[Artifact Load] Import prod"
         uses: cytopia/shell-command-retry-action@v0.1.2
         with:
           command: |
             make load INFILE=${{ steps.set-artifact-name.outputs.prod }}
+        if: ${{ inputs.flavour == 'prod' }}
+
+      ###
+      ### Download and import work
+      ###
+      - name: "[Artifact Load] Download work"
+        uses: Wandalen/wretry.action@v1.0.11
+        with:
+          action: actions/download-artifact@v3
+          with: |
+            name: ${{ steps.set-artifact-name.outputs.work }}
+          attempt_limit: 20
+          attempt_delay: 10000
+        if: ${{ inputs.flavour == 'work' }}
+
+      - name: "[Artifact Load] Import work"
+        uses: cytopia/shell-command-retry-action@v0.1.2
+        with:
+          command: |
+            make load INFILE=${{ steps.set-artifact-name.outputs.work }}
         if: ${{ inputs.flavour == 'work' }}