From 17a199c2bc8e5c5a08ff4663a699cdbb11050eb5 Mon Sep 17 00:00:00 2001
From: Iscle <albertiscle9@gmail.com>
Date: Sun, 3 Sep 2023 03:47:26 +0200
Subject: [PATCH] actions: Do everything in the same workflow

---
 .github/workflows/build.yml                 | 38 +++++++++++++++++-
 .github/workflows/package-magisk-module.yml | 43 ---------------------
 2 files changed, 36 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/package-magisk-module.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3fcf17e..b7b4983 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,5 +48,39 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: compiled-binaries
-          path: |
-            libv4a_re_*.so
+          path: libv4a_re_*.so
+
+  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
diff --git a/.github/workflows/package-magisk-module.yml b/.github/workflows/package-magisk-module.yml
deleted file mode 100644
index f424bdd..0000000
--- a/.github/workflows/package-magisk-module.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-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