Fix: Github CI fix again (windows msi with wix) && autonomous msi workflow

.github/workflows/ci.yml

@@ -48,7 +48,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential cmake pkg-config libasound2-dev libclang-dev libjack-dev \
-            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev
+            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev \
+            libx11-dev libx11-xcb-dev libxcursor-dev libxrandr-dev libxi-dev libwayland-dev
 
       - name: Install dependencies (macOS)
         if: runner.os == 'macOS'

.github/workflows/msi.yml

@@ -0,0 +1,32 @@
+name: MSI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Build CLI
+        run: cargo build --release
+
+      - name: Build Desktop
+        run: cargo build --release --features desktop --bin cagire-desktop
+
+      - name: Install cargo-wix
+        run: cargo install cargo-wix
+
+      - name: Build MSI
+        run: cargo wix --no-build --nocapture --package cagire -C -p -C x64
+
+      - name: Upload MSI
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-msi
+          path: target/wix/*.msi

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
             artifact: cagire-windows-x86_64
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
+    timeout-minutes: 60
 
     steps:
       - uses: actions/checkout@v4
@@ -51,22 +51,19 @@ jobs:
         with:
           key: ${{ matrix.target }}
 
-      - name: Install cargo-binstall
-        uses: cargo-bins/cargo-binstall@main
-
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential cmake pkg-config libasound2-dev libclang-dev libjack-dev \
-            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev
+            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev \
-          cargo binstall -y cargo-bundle
+            libx11-dev libx11-xcb-dev libxcursor-dev libxrandr-dev libxi-dev libwayland-dev
+          cargo install cargo-bundle
 
       - name: Install dependencies (macOS)
         if: runner.os == 'macOS'
         run: |
           brew list cmake &>/dev/null || brew install cmake
-          cargo binstall -y cargo-bundle
 
       - name: Install dependencies (Windows)
         if: runner.os == 'Windows'
@@ -80,8 +77,12 @@ jobs:
       - name: Build desktop
         run: cargo build --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
 
-      - name: Bundle desktop app
+      - name: Bundle desktop app (macOS)
-        if: runner.os != 'Windows'
+        if: runner.os == 'macOS'
+        run: scripts/make-app-bundle.sh ${{ matrix.target }}
+
+      - name: Bundle desktop app (Linux)
+        if: runner.os == 'Linux'
         run: cargo bundle --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
 
       - name: Build AppImages (Linux)
@@ -148,7 +149,7 @@ jobs:
 
       - name: Build MSI installer (Windows)
         if: runner.os == 'Windows'
-        run: cargo wix --no-build --nocapture -C -p -C x64
+        run: cargo wix --no-build --nocapture --package cagire -C -p -C x64
 
       - name: Upload MSI installer (Windows)
         if: runner.os == 'Windows'

scripts/build-all.sh

@@ -330,7 +330,7 @@ copy_artifacts() {
     # MSI installer for Windows targets
     if [[ "$os" == "windows" ]] && command -v cargo-wix &>/dev/null; then
         echo "    Building MSI installer..."
-        cargo wix --no-build --nocapture -C -p -C x64
+        cargo wix --no-build --nocapture --package cagire -C -p -C x64
         cp target/wix/*.msi "$OUT/" 2>/dev/null && echo "    MSI -> $OUT/" || true
     fi
 

scripts/cross/aarch64-linux.Dockerfile

@@ -14,4 +14,8 @@ RUN dpkg --add-architecture arm64 && \
         libxcb-xfixes0-dev:arm64 \
         libxkbcommon-dev:arm64 \
         libgl1-mesa-dev:arm64 \
+        libxcursor-dev:arm64 \
+        libxrandr-dev:arm64 \
+        libxi-dev:arm64 \
+        libwayland-dev:arm64 \
     && rm -rf /var/lib/apt/lists/*

scripts/cross/x86_64-linux.Dockerfile

@@ -13,4 +13,8 @@ RUN apt-get update && \
         libxcb-xfixes0-dev \
         libxkbcommon-dev \
         libgl1-mesa-dev \
+        libxcursor-dev \
+        libxrandr-dev \
+        libxi-dev \
+        libwayland-dev \
     && rm -rf /var/lib/apt/lists/*

scripts/make-app-bundle.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Usage: scripts/make-app-bundle.sh <target>
+# Creates a macOS .app bundle at target/<target>/release/bundle/osx/Cagire.app
+
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 <target>"
+    exit 1
+fi
+
+TARGET="$1"
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+BINARY="$REPO_ROOT/target/$TARGET/release/cagire-desktop"
+ICON="$REPO_ROOT/assets/Cagire.icns"
+VERSION="0.1.0"
+
+if [[ ! -f "$BINARY" ]]; then
+    echo "ERROR: binary not found at $BINARY"
+    exit 1
+fi
+
+APP_DIR="$REPO_ROOT/target/$TARGET/release/bundle/osx/Cagire.app"
+CONTENTS="$APP_DIR/Contents"
+rm -rf "$APP_DIR"
+mkdir -p "$CONTENTS/MacOS" "$CONTENTS/Resources"
+
+cp "$BINARY" "$CONTENTS/MacOS/cagire-desktop"
+[[ -f "$ICON" ]] && cp "$ICON" "$CONTENTS/Resources/Cagire.icns"
+
+cat > "$CONTENTS/Info.plist" <<PLIST
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleName</key>
+    <string>Cagire</string>
+    <key>CFBundleDisplayName</key>
+    <string>Cagire</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.sova.cagire</string>
+    <key>CFBundleVersion</key>
+    <string>${VERSION}</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${VERSION}</string>
+    <key>CFBundleExecutable</key>
+    <string>cagire-desktop</string>
+    <key>CFBundleIconFile</key>
+    <string>Cagire.icns</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>12.0</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.music</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright (c) 2025 Raphaël Forment</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Cagire needs microphone access for audio input.</string>
+</dict>
+</plist>
+PLIST
+
+echo "  APP -> $APP_DIR"