Merge branch 'fabianthdev/feature/SwiftUI' into naturecodevoid/swiftui-improvements

.github/workflows/beta.yml

@@ -1,16 +1,12 @@
 name: Beta SideStore build
 on:
   push:
-    branches:
-      - develop
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' # example: 1.0.0-beta.1
 
 jobs:
   build:
     name: Build and upload SideStore Beta
-    if: startsWith(github.event.head_commit.message, '[beta]')
-    concurrency:
-      group: ${{ github.ref }}
-      cancel-in-progress: true
     strategy:
       fail-fast: false
       matrix:
@@ -25,66 +21,21 @@ jobs:
         with:
           submodules: recursive
 
-      # - name: Cache rust cargo
-      #   id: cache-rust-cargo
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-cargo
-      #   with:
-      #     path: ~/.cargo
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust minimuxer
-      #   id: cache-rust-minimuxer
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-minimuxer
-      #   with:
-      #     path: ./Dependencies/minimuxer/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust em_proxy
-      #   id: cache-rust-em_proxy
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-em_proxy
-      #   with:
-      #     path: ./Dependencies/em_proxy/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Install rustup
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          target: aarch64-apple-ios
-
-      # - name: Create emotional damage
-      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
-
-      # - name: Build minimuxer
-      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
+      - name: Change version to tag
+        run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
 
       - name: Change default icon to beta icon
         run: sed -e 's/= Neon/= Starburst/' -i '' ./AltStore.xcodeproj/project.pbxproj
 
-      - name: Add beta suffix to version
-        run: sed -e '/MARKETING_VERSION = .*/s/$/-beta.${{ github.run_number }}/' -i '' Build.xcconfig
+      - name: Get version
+        id: version
+        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+
+      - name: Echo version
+        run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -92,39 +43,25 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: |
-          xcodebuild -project AltStore.xcodeproj \
-          -scheme AltStore \
-          -sdk iphoneos \
-          archive -archivePath ./archive \
-          CODE_SIGNING_REQUIRED=NO \
-          AD_HOC_CODE_SIGNING_ALLOWED=YES \
-          CODE_SIGNING_ALLOWED=NO \
-          DEVELOPMENT_TEAM=XYZ0123456 \
-          ORG_IDENTIFIER=com.SideStore \
-          | xcpretty && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: |
-          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
-          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
+        run: make fakesign
 
       - name: Convert to IPA
-        run: |
-          mkdir Payload
-          mkdir Payload/SideStore.app
-          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
-          zip -r SideStore.ipa Payload
+        run: make ipa
 
-      - name: Upload Artifact
+      - name: Upload SideStore.ipa Artifact
         uses: actions/upload-artifact@v3.1.0
         with:
-          name: SideStore.ipa
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore.ipa
 
-      - name: Get version
-        id: version
-        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-dSYM
+          path: ./*.dSYM/
 
       - name: Get current date
         id: date
@@ -134,22 +71,22 @@ jobs:
         id: date_altstore
         run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
 
-      - name: Upload to beta release
-        uses: IsaacShelton/update-existing-release@v1.3.1
+      - name: Upload to new beta release
+        uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          release: "Beta"
-          tag: "beta"
+          name: ${{ steps.version.outputs.version }}
+          tag_name: ${{ github.ref_name }}
+          draft: true
           prerelease: true
           files: SideStore.ipa
           body: |
-            This is an ⚠️ **EXPERIMENTAL** ⚠️ beta build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
+            <!-- NOTE: to reset SideSource cache, go to `https://apps.sidestore.io/reset-cache/nightly/<sidesource key>`. This is not included in the GitHub Action since it makes draft releases so they can be edited and have a changelog. -->
+            Beta builds are hand-picked builds from development commits that will allow you to try out new features earlier than normal. However, **they might contain bugs and other issues. Use at your own risk!**
+
+            ## Changelog
             
-            Beta builds are hand-picked builds from development commits that will allow you to try out new features earlier than normal, but with a lower chance of bugs than if you used nightly builds. However, since these changes are newer and less tested, they still have a good chance of bugs, so **use at your own risk**.
-            
-            If you want to be on the bleeding edge and use the latest development builds, you can look at [SideStore Nightly](https://github.com/${{ github.repository }}/releases/tag/nightly). **Please be aware that these builds have a much higher chance of bugs than beta or stable**.
-            
-            If you use the `SideStore (Beta)` app, it will use the latest beta build (make sure to update it in "My Apps").
+            - TODO
             
             ## Build Info
             

.github/workflows/increase-nightly-build-num.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Ensure we are in root directory
+cd "$(dirname "$0")/../.."
+
+DATE=`date -u +'%Y.%m.%d'`
+BUILD_NUM=1
+
+write() {
+    sed -e "/MARKETING_VERSION = .*/s/$/-nightly.$DATE.$BUILD_NUM+$(git rev-parse --short HEAD)/" -i '' Build.xcconfig
+    echo "$DATE,$BUILD_NUM" > .nightly-build-num
+}
+
+if [ ! -f ".nightly-build-num" ]; then
+    write
+    exit 0
+fi
+
+LAST_DATE=`cat .nightly-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $1'`
+LAST_BUILD_NUM=`cat .nightly-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $2'`
+
+if [[ "$DATE" != "$LAST_DATE" ]]; then
+    write
+else
+    BUILD_NUM=`expr $LAST_BUILD_NUM + 1`
+    write
+fi
+

.github/workflows/nightly.yml

@@ -24,66 +24,27 @@ jobs:
         with:
           submodules: recursive
 
-      # - name: Cache rust cargo
-      #   id: cache-rust-cargo
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-cargo
-      #   with:
-      #     path: ~/.cargo
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust minimuxer
-      #   id: cache-rust-minimuxer
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-minimuxer
-      #   with:
-      #     path: ./Dependencies/minimuxer/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust em_proxy
-      #   id: cache-rust-em_proxy
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-em_proxy
-      #   with:
-      #     path: ./Dependencies/em_proxy/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Install rustup
-        uses: actions-rs/toolchain@v1
+      - name: Cache .nightly-build-num
+        uses: actions/cache@v3
         with:
-          toolchain: stable
-          override: true
-          target: aarch64-apple-ios
+          path: .nightly-build-num
+          key: nightly-build-num
 
-      # - name: Create emotional damage
-      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
-
-      # - name: Build minimuxer
-      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
+      - name: Increase nightly build number and set as version
+        run: bash .github/workflows/increase-nightly-build-num.sh
 
       - name: Change default icon to nightly icon
         run: sed -e 's/= Neon/= Steel/' -i '' ./AltStore.xcodeproj/project.pbxproj
 
-      - name: Add nightly suffix to version
-        run: sed -e '/MARKETING_VERSION = .*/s/$/-nightly.${{ github.run_number }}/' -i '' Build.xcconfig
+      - name: Get version
+        id: version
+        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+
+      - name: Echo version
+        run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -91,39 +52,25 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: |
-          xcodebuild -project AltStore.xcodeproj \
-          -scheme AltStore \
-          -sdk iphoneos \
-          archive -archivePath ./archive \
-          CODE_SIGNING_REQUIRED=NO \
-          AD_HOC_CODE_SIGNING_ALLOWED=YES \
-          CODE_SIGNING_ALLOWED=NO \
-          DEVELOPMENT_TEAM=XYZ0123456 \
-          ORG_IDENTIFIER=com.SideStore \
-          | xcpretty && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: |
-          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
-          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
+        run: make fakesign
 
       - name: Convert to IPA
-        run: |
-          mkdir Payload
-          mkdir Payload/SideStore.app
-          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
-          zip -r SideStore.ipa Payload
+        run: make ipa
 
-      - name: Upload Artifact
+      - name: Upload SideStore.ipa Artifact
         uses: actions/upload-artifact@v3.1.0
         with:
-          name: SideStore.ipa
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore.ipa
 
-      - name: Get version
-        id: version
-        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-dSYM
+          path: ./*.dSYM/
 
       - name: Get current date
         id: date
@@ -144,11 +91,9 @@ jobs:
           body: |
             This is an ⚠️ **EXPERIMENTAL** ⚠️ nightly build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
             
-            Nightly builds are built from the most recent commit which means you'll be able to try out new features very early. However, since these changes are much newer and less tested, they have a much higher chance of bugs, so **use at your own risk**.
+            Nightly builds are **extremely experimental builds only meant to be used by developers and alpha testers. They often contain bugs and experimental features. Use at your own risk!**
             
-            If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases/tag/beta).
-            
-            If you use the `SideStore (Nightly)` app, it will use the latest nightly build (make sure to update it in "My Apps").
+            If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases?q=beta).
             
             ## Build Info
             
@@ -156,3 +101,6 @@ jobs:
             Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
             Commit SHA: `${{ github.sha }}`
             Version: `${{ steps.version.outputs.version }}`
+
+      - name: Reset cache for apps.sidestore.io/nightly
+        run: sleep 10 && curl https://apps.sidestore.io/reset-cache/nightly/${{ secrets.SIDESOURCE_KEY }}

.github/workflows/pr.yml

@@ -19,63 +19,20 @@ jobs:
         with:
           submodules: recursive
 
-      # - name: Cache rust cargo
-      #   id: cache-rust-cargo
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-cargo
-      #   with:
-      #     path: ~/.cargo
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust minimuxer
-      #   id: cache-rust-minimuxer
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-minimuxer
-      #   with:
-      #     path: ./Dependencies/minimuxer/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust em_proxy
-      #   id: cache-rust-em_proxy
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-em_proxy
-      #   with:
-      #     path: ./Dependencies/em_proxy/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Install rustup
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          target: aarch64-apple-ios
-
-      # - name: Create emotional damage
-      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
-
-      # - name: Build minimuxer
-      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
-
       - name: Add PR suffix to version
-        run: sed -e '/MARKETING_VERSION = .*/s/$/-pr.${{ github.event.pull_request.number }}/' -i '' Build.xcconfig
+        run: sed -e "/MARKETING_VERSION = .*/s/\$/-pr.${{ github.event.pull_request.number }}+$(git rev-parse --short ${COMMIT:-HEAD})/" -i '' Build.xcconfig
+        env:
+          COMMIT: ${{ github.event.pull_request.head.sha }}
+
+      - name: Get version
+        id: version
+        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+
+      - name: Echo version
+        run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -83,32 +40,22 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: |
-          xcodebuild -project AltStore.xcodeproj \
-          -scheme AltStore \
-          -sdk iphoneos \
-          archive -archivePath ./archive \
-          CODE_SIGNING_REQUIRED=NO \
-          AD_HOC_CODE_SIGNING_ALLOWED=YES \
-          CODE_SIGNING_ALLOWED=NO \
-          DEVELOPMENT_TEAM=XYZ0123456 \
-          ORG_IDENTIFIER=com.SideStore \
-          | xcpretty && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: |
-          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
-          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
+        run: make fakesign
 
       - name: Convert to IPA
-        run: |
-          mkdir Payload
-          mkdir Payload/SideStore.app
-          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
-          zip -r SideStore.ipa Payload
+        run: make ipa
 
-      - name: Upload Artifact
+      - name: Upload SideStore.ipa Artifact
         uses: actions/upload-artifact@v3.1.0
         with:
-          name: SideStore.ipa
+          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/

.github/workflows/stable.yml

@@ -2,7 +2,7 @@ name: Stable SideStore build
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+*'
+      - '[0-9]+.[0-9]+.[0-9]+' # example: 1.0.0
 
 jobs:
   build:
@@ -21,60 +21,18 @@ jobs:
         with:
           submodules: recursive
 
-      # - name: Cache rust cargo
-      #   id: cache-rust-cargo
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-cargo
-      #   with:
-      #     path: ~/.cargo
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust minimuxer
-      #   id: cache-rust-minimuxer
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-minimuxer
-      #   with:
-      #     path: ./Dependencies/minimuxer/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
-      # - name: Cache rust em_proxy
-      #   id: cache-rust-em_proxy
-      #   uses: actions/cache@v3
-      #   env:
-      #     cache-name: cache-rust-em_proxy
-      #   with:
-      #     path: ./Dependencies/em_proxy/target
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
-
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Install rustup
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          target: aarch64-apple-ios
+      - name: Change version to tag
+        run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
 
-      # - name: Create emotional damage
-      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
+      - name: Get version
+        id: version
+        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
 
-      # - name: Build minimuxer
-      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
+      - name: Echo version
+        run: echo "${{ steps.version.outputs.version }}"
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -82,39 +40,25 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: |
-          xcodebuild -project AltStore.xcodeproj \
-          -scheme AltStore \
-          -sdk iphoneos \
-          archive -archivePath ./archive \
-          CODE_SIGNING_REQUIRED=NO \
-          AD_HOC_CODE_SIGNING_ALLOWED=YES \
-          CODE_SIGNING_ALLOWED=NO \
-          DEVELOPMENT_TEAM=XYZ0123456 \
-          ORG_IDENTIFIER=com.SideStore \
-          | xcpretty && exit ${PIPESTATUS[0]}
+        run: make build | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: |
-          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
-          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
+        run: make fakesign
 
       - name: Convert to IPA
-        run: |
-          mkdir Payload
-          mkdir Payload/SideStore.app
-          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
-          zip -r SideStore.ipa Payload
+        run: make ipa
 
-      - name: Upload Artifact
+      - name: Upload SideStore.ipa Artifact
         uses: actions/upload-artifact@v3.1.0
         with:
-          name: SideStore.ipa
+          name: SideStore-${{ steps.version.outputs.version }}.ipa
           path: SideStore.ipa
 
-      - name: Get version
-        id: version
-        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
+      - name: Upload *.dSYM Artifact
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: SideStore-dSYM
+          path: ./*.dSYM/
 
       - name: Get current date
         id: date
@@ -129,10 +73,11 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref }}
+          tag_name: ${{ github.ref_name }}
           draft: true
           files: SideStore.ipa
           body: |
+            <!-- NOTE: to reset SideSource cache, go to `https://apps.sidestore.io/reset-cache/nightly/<sidesource key>`. This is not included in the GitHub Action since it makes draft releases so they can be edited and have a changelog. -->
             ## Changelog
             
             - TODO