From 69f6395bec88c4ec221e9340418176eee233e76b Mon Sep 17 00:00:00 2001
From: Iscle <albertiscle9@gmail.com>
Date: Sun, 3 Sep 2023 03:41:32 +0200
Subject: [PATCH] actions: Only package the module after everything is built

---
 .github/workflows/build.yml                 | 25 ++----------
 .github/workflows/package-magisk-module.yml | 43 +++++++++++++++++++++
 2 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/package-magisk-module.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b62679c..3fcf17e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,28 +44,9 @@ jobs:
         run: |
           mv libv4a_re.so libv4a_re_${{ matrix.abi }}.so
 
-      # Move compiled libraries into the Magisk module folder
-      - name: Move to Magisk Module
-        run: |
-          mkdir -p module/common/files/${{ matrix.abi }}
-          mv libv4a_re_${{ matrix.abi }}.so module/common/files/${{ matrix.abi }}/
-
-      # Zip the Magisk module folder
-      - name: Zip Magisk Module
-        run: |
-          cd module
-          zip -r ../magisk_module.zip ./
-
-      # Upload the Magisk module zip as an artifact
-      - name: Upload Magisk Module
-        uses: actions/upload-artifact@v3
-        with:
-          name: magisk_module
-          path: magisk_module.zip
-
-      # Upload compiled libraries as an artifact
-      - name: Upload compiled libraries
+      - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: compiled-binaries
-          path: libv4a_re_*.so
+          path: |
+            libv4a_re_*.so
diff --git a/.github/workflows/package-magisk-module.yml b/.github/workflows/package-magisk-module.yml
new file mode 100644
index 0000000..f424bdd
--- /dev/null
+++ b/.github/workflows/package-magisk-module.yml
@@ -0,0 +1,43 @@
+name: Package Magisk Module
+
+on:
+  workflow_run:
+    workflows: ["build"]
+    types:
+      - completed
+
+jobs:
+  package:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Download the compiled binaries from the 'build' workflow
+      - name: Download compiled libraries
+        uses: actions/download-artifact@v3
+        with:
+          name: compiled-binaries
+          path: compiled/
+
+      # Prepare Magisk module directory by copying the necessary ABI files
+      - name: Prepare Magisk Module
+        run: |
+          for abi in armeabi-v7a arm64-v8a x86 x86_64; do
+            mkdir -p module/common/files/$abi
+            cp compiled/libv4a_re_$abi.so module/common/files/$abi/
+          done
+
+      # Zip the Magisk module
+      - name: Zip Magisk Module
+        run: |
+          cd module
+          zip -r ../magisk_module.zip ./
+
+      # Upload the zipped Magisk module as an artifact
+      - name: Upload Magisk Module
+        uses: actions/upload-artifact@v3
+        with:
+          name: magisk_module
+          path: magisk_module.zip