Upload all discovered Windows installers in CI

Author: kiyarose

.github/workflows/build-and-release.yml

@@ -78,20 +78,22 @@ jobs:
         if: matrix.os == 'windows-2022'
         shell: bash
         run: |
-          shopt -s nullglob
-          src=(
-            cross-platform/src-tauri/target/release/bundle/nsis/*.exe
-            cross-platform/src-tauri/target/release/bundle/msi/*.msi
+          shopt -s nullglob globstar
+          installer_candidates=(
+            cross-platform/src-tauri/target/release/bundle/nsis/**/*.exe
+            cross-platform/src-tauri/target/release/bundle/msi/**/*.msi
+            cross-platform/src-tauri/target/release/bundle/wix/**/*.msi
           )
-          if [ ${#src[@]} -eq 0 ]; then
-            echo "No Windows installer found (expected NSIS .exe or MSI .msi)"
+          if [ ${#installer_candidates[@]} -eq 0 ]; then
+            echo "No Windows installer artifacts found under cross-platform/src-tauri/target/release/bundle/{nsis,msi,wix}"
             exit 1
           fi
-          installer_path="${src[0]}"
-          installer_ext="${installer_path##*.}"
-          installer_name="PinStick-${APP_VERSION}-windows.${installer_ext}"
-          cp "$installer_path" "$installer_name"
-          printf "WINDOWS_INSTALLER=%s\n" "$installer_name" >> "$GITHUB_ENV"
+          artifact_dir="PinStick-${APP_VERSION}-windows"
+          mkdir -p "$artifact_dir"
+          for installer_path in "${installer_candidates[@]}"; do
+            cp "$installer_path" "$artifact_dir/"
+          done
+          printf "WINDOWS_ARTIFACT_DIR=%s\n" "$artifact_dir" >> "$GITHUB_ENV"
 
       - name: Collect Linux AppImage
         if: matrix.os == 'ubuntu-22.04'
@@ -117,7 +119,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: PinStick-windows
-          path: ${{ env.WINDOWS_INSTALLER }}
+          path: ${{ env.WINDOWS_ARTIFACT_DIR }}
           if-no-files-found: error
 
       - name: Upload Linux artifact

.github/workflows/prerelease.yml

@@ -85,20 +85,22 @@ jobs:
         if: matrix.os == 'windows-2022'
         shell: bash
         run: |
-          shopt -s nullglob
-          src=(
-            cross-platform/src-tauri/target/release/bundle/nsis/*.exe
-            cross-platform/src-tauri/target/release/bundle/msi/*.msi
+          shopt -s nullglob globstar
+          installer_candidates=(
+            cross-platform/src-tauri/target/release/bundle/nsis/**/*.exe
+            cross-platform/src-tauri/target/release/bundle/msi/**/*.msi
+            cross-platform/src-tauri/target/release/bundle/wix/**/*.msi
           )
-          if [ ${#src[@]} -eq 0 ]; then
-            echo "No Windows installer found (expected NSIS .exe or MSI .msi)"
+          if [ ${#installer_candidates[@]} -eq 0 ]; then
+            echo "No Windows installer artifacts found under cross-platform/src-tauri/target/release/bundle/{nsis,msi,wix}"
             exit 1
           fi
-          installer_path="${src[0]}"
-          installer_ext="${installer_path##*.}"
-          installer_name="PinStick-${APP_VERSION}-windows.${installer_ext}"
-          cp "$installer_path" "$installer_name"
-          printf "WINDOWS_INSTALLER=%s\n" "$installer_name" >> "$GITHUB_ENV"
+          artifact_dir="PinStick-${APP_VERSION}-windows"
+          mkdir -p "$artifact_dir"
+          for installer_path in "${installer_candidates[@]}"; do
+            cp "$installer_path" "$artifact_dir/"
+          done
+          printf "WINDOWS_ARTIFACT_DIR=%s\n" "$artifact_dir" >> "$GITHUB_ENV"
 
       - name: Collect Linux AppImage
         if: matrix.os == 'ubuntu-22.04'
@@ -124,7 +126,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: PinStick-windows
-          path: ${{ env.WINDOWS_INSTALLER }}
+          path: ${{ env.WINDOWS_ARTIFACT_DIR }}
           if-no-files-found: error
 
       - name: Upload Linux artifact