Merge commit '6e3bf5fbf9558dcfcfb12f65890391945e554f7e' into feature-…

…clean
DIDIRUS4 · Sep 11, 2024 · d1f3110 · d1f3110
2 parents c726917 + 6e3bf5f
commit d1f3110
Show file tree

Hide file tree

Showing 40 changed files with 2,784 additions and 2,593 deletions.
diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml
@@ -42,6 +42,9 @@ jobs:
         with:
           components: rustfmt, clippy
 
+      - name: Install Tauri CLI
+        run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5e2942876c2266594ed1db516c1d9975c873c36a
+
       - name: Setup rust cache
         uses: actions/cache@v4
         with:
@@ -60,9 +63,13 @@ jobs:
             !target/release/bundle/*/*.deb
             !target/release/bundle/*/*.rpm
 
-            !target/release/bundle/*/*.msi
-            !target/release/bundle/*/*.msi.zip
-            !target/release/bundle/*/*.msi.zip.sig
+            !target/release/bundle/msi/*.msi
+            !target/release/bundle/msi/*.msi.zip
+            !target/release/bundle/msi/*.msi.zip.sig
+            
+            !target/release/bundle/nsis/*.exe
+            !target/release/bundle/nsis/*.nsis.zip
+            !target/release/bundle/nsis/*.nsis.zip.sig
           key: ${{ runner.os }}-rust-target-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-target-
@@ -108,6 +115,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          V1_COMPATIBLE_BIN_NAME: true
 
       - name: build app
         run: pnpm --filter=@modrinth/app run tauri build --config "tauri-release.conf.json"
@@ -117,6 +125,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          V1_COMPATIBLE_BIN_NAME: true
 
       - name: upload ${{ matrix.platform }}
         uses: actions/upload-artifact@v4
@@ -136,7 +145,10 @@ jobs:
             target/release/bundle/*/*.deb
             target/release/bundle/*/*.rpm
 
-            target/release/bundle/*/*.msi
-            target/release/bundle/*/*.msi.zip
-            target/release/bundle/*/*.msi.zip.sig
-
+            target/release/bundle/msi/*.msi
+            target/release/bundle/msi/*.msi.zip
+            target/release/bundle/msi/*.msi.zip.sig
+            
+            target/release/bundle/nsis/*.exe
+            target/release/bundle/nsis/*.nsis.zip
+            target/release/bundle/nsis/*.nsis.zip.sig