From 2e369c03b860258c30e81eeb366596c722a323a2 Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:51:47 -0800
Subject: [PATCH] ci: Revert back to unzipped Android artifacts. (#7258)

---
 .ci/pack.sh                 | 16 ++++++++++++----
 .github/workflows/build.yml |  3 +--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.ci/pack.sh b/.ci/pack.sh
index dda6be33be..67275954a9 100755
--- a/.ci/pack.sh
+++ b/.ci/pack.sh
@@ -61,12 +61,20 @@ function pack_artifacts() {
     fi
 }
 
-if [ -z "$PACK_INDIVIDUALLY" ]; then
-    # Pack all of the artifacts at once.
-    pack_artifacts build/bundle
-else
+if [ -n "$UNPACKED" ]; then
+    # Copy the artifacts to be uploaded unpacked.
+    for ARTIFACT in build/bundle/*; do
+        FILENAME=$(basename "$ARTIFACT")
+        EXTENSION="${FILENAME##*.}"
+
+        mv "$ARTIFACT" "artifacts/$REV_NAME.$EXTENSION"
+    done
+elif [ -n "$PACK_INDIVIDUALLY" ]; then
     # Pack and upload the artifacts one-by-one.
     for ARTIFACT in build/bundle/*; do
         pack_artifacts "$ARTIFACT"
     done
+else
+    # Pack all of the artifacts into a single archive.
+    pack_artifacts build/bundle
 fi
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 049cac0dd5..1e501ee56b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -226,8 +226,7 @@ jobs:
         run: ../../../.ci/pack.sh
         working-directory: src/android/app
         env:
-          PACK_INDIVIDUALLY: 1
-          SKIP_7Z: 1
+          UNPACKED: 1
       - name: Upload
         uses: actions/upload-artifact@v3
         with: