From 51ed87086ab6165d3461a86656941edfb80f0983 Mon Sep 17 00:00:00 2001
From: naturecodevoid <44983869+naturecodevoid@users.noreply.github.com>
Date: Thu, 13 Apr 2023 07:30:20 -0700
Subject: [PATCH] [skip ci] ci: fully rename SideStore.ipa, even after
 extracting the artifact zip

---
 .github/workflows/beta.yml    | 27 +++++++++++++++------------
 .github/workflows/nightly.yml | 27 +++++++++++++++------------
 .github/workflows/pr.yml      |  7 +++++--
 .github/workflows/stable.yml  | 27 +++++++++++++++------------
 4 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 1973681b..e5792b55 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -48,18 +48,6 @@ jobs:
       - name: Convert to IPA
         run: make ipa
 
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v3.1.0
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore.ipa
-
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v3.1.0
-        with:
-          name: SideStore-dSYM
-          path: ./*.dSYM/
-
       - name: Get current date
         id: date
         run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
@@ -91,3 +79,18 @@ jobs:
             Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
             Commit SHA: `${{ github.sha }}`
             Version: `${{ steps.version.outputs.version }}`
+
+      - name: Add version to IPA file name
+        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
+
+      - name: Upload SideStore.ipa Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
+          path: SideStore-${{ steps.version.outputs.version }}.ipa
+
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}-dSYM
+          path: ./*.dSYM/
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 96acefed..aea20363 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -57,18 +57,6 @@ jobs:
       - name: Convert to IPA
         run: make ipa
 
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v3.1.0
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore.ipa
-
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v3.1.0
-        with:
-          name: SideStore-dSYM
-          path: ./*.dSYM/
-
       - name: Get current date
         id: date
         run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
@@ -99,5 +87,20 @@ jobs:
             Commit SHA: `${{ github.sha }}`
             Version: `${{ steps.version.outputs.version }}`
 
+      - name: Add version to IPA file name
+        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
+
+      - name: Upload SideStore.ipa Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
+          path: SideStore-${{ steps.version.outputs.version }}.ipa
+
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}-dSYM
+          path: ./*.dSYM/
+
       - name: Reset cache for apps.sidestore.io/nightly
         run: sleep 10 && curl https://apps.sidestore.io/reset-cache/nightly/${{ secrets.SIDESOURCE_KEY }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 7e3df0eb..6befcfbb 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -48,14 +48,17 @@ jobs:
       - name: Convert to IPA
         run: make ipa
 
+      - name: Add version to IPA file name
+        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
+
       - name: Upload SideStore.ipa Artifact
         uses: actions/upload-artifact@v3.1.0
         with:
           name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore.ipa
+          path: SideStore-${{ steps.version.outputs.version }}.ipa
 
       - name: Upload *.dSYM Artifact
         uses: actions/upload-artifact@v3.1.0
         with:
-          name: SideStore-dSYM
+          name: SideStore-${{ steps.version.outputs.version }}-dSYM
           path: ./*.dSYM/
diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
index 06a759ae..d1a6d1e5 100644
--- a/.github/workflows/stable.yml
+++ b/.github/workflows/stable.yml
@@ -48,18 +48,6 @@ jobs:
       - name: Convert to IPA
         run: make ipa
 
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v3.1.0
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore.ipa
-
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v3.1.0
-        with:
-          name: SideStore-dSYM
-          path: ./*.dSYM/
-
       - name: Get current date
         id: date
         run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
@@ -88,3 +76,18 @@ jobs:
             Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
             Commit SHA: `${{ github.sha }}`
             Version: `${{ steps.version.outputs.version }}`
+
+      - name: Add version to IPA file name
+        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
+
+      - name: Upload SideStore.ipa Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
+          path: SideStore-${{ steps.version.outputs.version }}.ipa
+
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-${{ steps.version.outputs.version }}-dSYM
+          path: ./*.dSYM/