Fixes for releases

.github/workflows/Build.yml

@@ -110,6 +110,7 @@ jobs:
             desktop/build/compose/binaries/main-release/*/
             desktop/build/compose/jars/
             !desktop/build/compose/binaries/main/app/
+            !desktop/build/compose/binaries/main-release/app/
             ${{ env.ANDROID_SIGNED_FILE }}
 
         # Upload runner errors
@@ -154,6 +155,7 @@ jobs:
             desktop/build/compose/binaries/main-release/*/
             desktop/build/compose/jars/
             !desktop/build/compose/binaries/main/app/
+            !desktop/build/compose/binaries/main-release/app/
 
         # Upload runner errors
       - name: Upload error logs

.github/workflows/Preview.yml

@@ -118,6 +118,7 @@ jobs:
             desktop/build/compose/binaries/main-release/*/
             desktop/build/compose/jars/
             !desktop/build/compose/binaries/main/app/
+            !desktop/build/compose/binaries/main-release/app/
             ${{ env.ANDROID_SIGNED_FILE }}
 
         # Upload runner errors
@@ -162,6 +163,7 @@ jobs:
             desktop/build/compose/binaries/main-release/*/
             desktop/build/compose/jars/
             !desktop/build/compose/binaries/main/app/
+            !desktop/build/compose/binaries/main-release/app/
 
         # Upload runner errors
       - name: Upload error logs
@@ -197,11 +199,10 @@ jobs:
 
       - name: Get previous release
         id: last_release
-        uses: Dmagine/get-latest-release@master
+        uses: pozetroninc/github-action-get-latest-release@v0.7.0
         with:
-          myToken: ${{ github.token }}
+          token: ${{ github.token }}
-          exclude_types: "draft|prerelease"
+          exclude_types: "prerelease, draft"
-          view_top: 1
           owner: Suwayomi
           repo: Suwayomi-JUI-preview
 
@@ -212,7 +213,7 @@ jobs:
           echo "COMMIT_COUNT=$commit_count" >> $GITHUB_ENV
           current_sha=$(git rev-parse --short HEAD)
           echo "CURRENT_SHA=$current_sha" >> $GITHUB_ENV
-          prev_commit_count=$(echo "${{ steps.last_release.outputs.tag_name }}" | sed -e "s/^r//")
+          prev_commit_count=$(echo "${{ steps.last_release.outputs.release }}" | sed -e "s/^r//")
           commit_count_diff=$(expr $commit_count - $prev_commit_count)
           prev_release_sha=$(git rev-parse --short HEAD~$commit_count_diff)
           echo "PREV_RELEASE_SHA=$prev_release_sha" >> $GITHUB_ENV

scripts/NamingFix.sh

@@ -16,25 +16,25 @@ if [ -f "$msi" ]; then
   fi
 fi
 
-# Find DMG
+dmg_x64="$(find ./runner-package-osx-x64/binaries/\(main-release\|main\)/dmg/ -iname '*.dmg' 2>/dev/null)"
-dmg_dirs="$(find ./ -type d -iname '*-macos-*' 2>/dev/null)"
+if [ -f "$dmg_x64" ]; then
-for dir in $dmg_dirs; do
+  dir="$(dirname "$dmg_x64")"
-  arch=$(basename "$dir" | cut -d'-' -f3) # Extract architecture from directory name
+  version=$(tmp="${dmg_x64%.*}" && echo "${tmp##*-}")
-  dmg="$dir/*.dmg"
-  if [ "$(ls -A $dir/*.dmg 2>/dev/null)" ]; then
-    version=$(tmp=$(basename $dir/*.dmg .dmg) && echo "${tmp##*-}")
 
-    if [ "$arch" == "x64" ]; then
+  if [ "$(basename "$dmg_x64")" != "$name-macos-x64-$version.dmg" ]; then
-      if [ "$(basename $dir/*.dmg)" != "$name-macos-x64-$version.dmg" ]; then
+    mv "$dmg_x64" "$dir/$name-macos-x64-$version.dmg"
-        mv $dir/*.dmg "$dir/$name-macos-x64-$version.dmg"
-      fi
-    elif [ "$arch" == "arm64" ]; then
-      if [ "$(basename $dir/*.dmg)" != "$name-macos-arm64-$version.dmg" ]; then
-        mv $dir/*.dmg "$dir/$name-macos-arm64-$version.dmg"
-      fi
-    fi
   fi
-done
+fi
+
+dmg_arm64="$(find ./runner-package-osx-arm64/binaries/\(main-release\|main\)/dmg/ -iname '*.dmg' 2>/dev/null)"
+if [ -f "$dmg_arm64" ]; then
+  dir="$(dirname "$dmg_arm64")"
+  version=$(tmp="${dmg_arm64%.*}" && echo "${tmp##*-}")
+
+  if [ "$(basename "$dmg_arm64")" != "$name-macos-m1-$version.dmg" ]; then
+    mv "$dmg_arm64" "$dir/$name-macos-m1-$version.dmg"
+  fi
+fi
 
 apk="$(find ./ -iname '*.apk' 2>/dev/null)"
 if [ -f "$apk" ]; then