From d1b9cbe9e7fcc15893631e226cc08d4c439e01bc Mon Sep 17 00:00:00 2001
From: windowsboy111 <wboy111@outlook.com>
Date: Thu, 16 Mar 2023 19:30:59 +0800
Subject: [PATCH] fix(ci): mass-rebuild.yml

---
 .github/workflows/mass-rebuild-recurse.yml | 14 +++++++++-----
 .github/workflows/mass-rebuild.yml         | 16 +++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/mass-rebuild-recurse.yml b/.github/workflows/mass-rebuild-recurse.yml
index 3e8d2976e6..a6701eb7ca 100644
--- a/.github/workflows/mass-rebuild-recurse.yml
+++ b/.github/workflows/mass-rebuild-recurse.yml
@@ -14,6 +14,8 @@ jobs:
 
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
+      recurse: ${{ steps.generate_build_matrix.outputs.recurse }}
+      recurse_matrix: ${{ steps.generate_build_matrix.outputs.recurse_matrix }}
 
     container:
       image: ghcr.io/terrapkg/builder:main
@@ -37,11 +39,13 @@ jobs:
           EOF
           python x.py >> $GITHUB_OUTPUT
 
-      - name: Recurse builds
-        if: steps.generate_build_matrix.outputs.recurse == 1
-        uses: terrapkg/packages/.github/workflows/mass-rebuild-recurse.yml@f38
-        with:
-          packages: ${{ steps.generate_build_matrix.outputs.recurse_matrix }}
+  recurse:
+    needs: manifest
+    if: needs.manifest.outputs.recurse == 1
+    uses: terrapkg/packages/.github/workflows/mass-rebuild-recurse.yml@f38
+    with:
+      packages: ${{ needs.manifest.outputs.recurse_matrix }}
+
   build:
     needs: manifest
     strategy:
diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
index 2967c75e12..6f6e49bbf9 100644
--- a/.github/workflows/mass-rebuild.yml
+++ b/.github/workflows/mass-rebuild.yml
@@ -1,5 +1,3 @@
-# for each folder in anda/
-# generate a new workflow for each folder in anda/
 name: Mass Rebuild
 on:
   workflow_dispatch:
@@ -10,6 +8,8 @@ jobs:
 
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
+      recurse: ${{ steps.generate_build_matrix.outputs.recurse }}
+      recurse_matrix: ${{ steps.generate_build_matrix.outputs.recurse_matrix }}
 
     container:
       image: ghcr.io/terrapkg/builder:main
@@ -41,11 +41,13 @@ jobs:
           EOF
           python x.py >> $GITHUB_OUTPUT
 
-      - name: Recurse builds
-        if: steps.generate_build_matrix.outputs.recurse == 1
-        uses: terrapkg/packages/.github/workflows/mass-rebuild-recurse.yml@f38
-        with:
-          packages: ${{ steps.generate_build_matrix.outputs.recurse_matrix }}
+  recurse:
+    needs: manifest
+    if: needs.manifest.outputs.recurse == 1
+    uses: terrapkg/packages/.github/workflows/mass-rebuild-recurse.yml@f38
+    with:
+      packages: ${{ needs.manifest.outputs.recurse_matrix }}
+
   build:
     needs: manifest
     strategy: