Update LATEST_VERSION_MACOS to 3866aa6b0 [skip ci]

Signed-off-by: Mythrax <mythrax@mytrax-rs.org>

.github/workflows/build-windows.yml

@@ -97,8 +97,8 @@ jobs:
             mingw-w64-ucrt-x86_64-lz4
             mingw-w64-ucrt-x86_64-ffmpeg
             mingw-w64-ucrt-x86_64-opus
-            mingw-w64-ucrt-x86_64-libusb
             mingw-w64-ucrt-x86_64-openal
+            mingw-w64-ucrt-x86_64-libusb
             git
             base-devel
 
@@ -131,7 +131,7 @@ jobs:
         id: cache-build
         with:
           path: ./citron/build
-          key: mingw-build-${{ runner.os }}-${{ hashFiles('citron/CMakeLists.txt') }}
+          key: mingw-build-${{ runner.os }}-${{ hashFiles('citron/CMakeLists.txt') }}-${{ hashFiles('.github/workflows/build-windows.yml') }}
           restore-keys: |
             mingw-build-${{ runner.os }}-
 
@@ -143,6 +143,10 @@ jobs:
           VERSION=$(git rev-parse --short HEAD)
           echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Clear stale CMake cache (MinGW)
+        working-directory: ./citron
+        run: rm -f build/CMakeCache.txt
+
       - name: Configure CMake (MinGW)
         working-directory: ./citron
         run: |
@@ -163,64 +167,104 @@ jobs:
             -DENABLE_OPENSSL=ON \
             -DENABLE_CUBEB=OFF \
             -DENABLE_OPENAL=ON \
-            -DENABLE_LIBUSB=ON \
             -DUSE_DISCORD_PRESENCE=OFF \
             -DCITRON_USE_AUTO_UPDATER=OFF \
-            -DCITRON_USE_PRECOMPILED_HEADERS=ON
+            -DCITRON_USE_PRECOMPILED_HEADERS=ON \
+            -DENABLE_LIBUSB=OFF
 
       - name: Build Citron (MinGW)
         working-directory: ./citron
         run: cmake --build build --config Release -j$(nproc)
 
-      - name: Collect runtime DLL dependencies (MinGW)
+      - name: Copy vcpkg runtime DLLs to bin (MinGW)
         working-directory: ./citron
         run: |
-          set -e
+          # vcpkg's DLL directory is not on the shell PATH, so CMake's deploy step
+          # and ldd both miss these DLLs entirely.
+          VCPKG_BIN="./build/vcpkg_installed/x64-mingw-dynamic/bin"
           BIN_DIR="./build/bin"
-          if [ -d "$BIN_DIR/Release" ]; then
-            BIN_DIR="$BIN_DIR/Release"
+          if [ -d "$VCPKG_BIN" ]; then
+            find "$VCPKG_BIN" -maxdepth 1 -name "*.dll" -exec cp -v {} "$BIN_DIR/" \;
+          else
+            echo "Warning: vcpkg bin dir not found at $VCPKG_BIN"
           fi
 
-          TARGET_EXE="$BIN_DIR/citron.exe"
-          if [ ! -f "$TARGET_EXE" ]; then
-            TARGET_EXE="$(find "$BIN_DIR" -maxdepth 1 -type f -name "*.exe" | head -n 1)"
-          fi
+      - name: Prune unused DLLs from build/bin (MinGW)
+        working-directory: ./citron
+        run: |
+          # CopyMinGWDeps.cmake pulls in the full transitive closure of citron.exe
+          # through /ucrt64/bin, including many DLLs that are never actually loaded.
+          #
+          # We compute the true required set using a full recursive objdump closure:
+          # starting from the citron binaries, we follow every DLL import reference
+          # and collect any DLL that is present in build/bin. We repeat until no
+          # new DLLs are added. Anything not reached by this walk is deleted.
+          #
+          # This is correct by construction: if Windows would load a DLL at startup
+          # (directly or transitively through another DLL we ship), it will be in
+          # the closure. If it would not be loaded, it won't be. No hardcoded lists.
 
-          if [ -z "$TARGET_EXE" ] || [ ! -f "$TARGET_EXE" ]; then
-            echo "Could not find built executable in $BIN_DIR"
-            exit 1
-          fi
+          BIN_DIR="./build/bin"
 
-          VCPKG_BIN="$PWD/build/vcpkg_installed/x64-mingw-dynamic/bin"
-          UCRT_BIN="/ucrt64/bin"
-          : > runtime_dlls_windows.txt
+          echo "=== DLLs before pruning: $(find "$BIN_DIR" -maxdepth 1 -name "*.dll" | wc -l) ==="
 
-          # Resolve imported DLLs explicitly from known runtime locations.
-          objdump -p "$TARGET_EXE" 2>/dev/null \
-            | awk '/DLL Name:/ {print $3}' \
-            | sort -u \
-            | while read -r dll_name; do
-                found=""
-                if [ -f "$VCPKG_BIN/$dll_name" ]; then
-                  found="$VCPKG_BIN/$dll_name"
-                elif [ -f "$UCRT_BIN/$dll_name" ]; then
-                  found="$UCRT_BIN/$dll_name"
-                fi
+          # Build a lookup of lowercase dll name -> path for every DLL in bin/
+          declare -A bin_dlls
+          while IFS= read -r dll_path; do
+            dll_name=$(basename "$dll_path" | tr '[:upper:]' '[:lower:]')
+            bin_dlls["$dll_name"]="$dll_path"
+          done < <(find "$BIN_DIR" -maxdepth 1 -name "*.dll")
 
-                if [ -n "$found" ]; then
-                  cygpath -w "$found" >> runtime_dlls_windows.txt
-                fi
-              done
+          # Closure: set of lowercase dll names known to be required
+          declare -A closure
+          # Queue: dll names to process
+          declare -a queue
 
-          # Include indirect/runtime-linked DLLs detected by ldd as a fallback.
-          ldd "$TARGET_EXE" 2>/dev/null \
-            | awk '{for (i=1; i<=NF; i++) if ($i ~ /^\/.*\.dll$/) print $i}' \
-            | sort -u \
-            | while read -r dll_path; do
-                cygpath -w "$dll_path" >> runtime_dlls_windows.txt
-              done
+          # Seed with the citron executables
+          for exe in "$BIN_DIR"/citron.exe "$BIN_DIR"/citron-cmd.exe "$BIN_DIR"/citron-room.exe; do
+            [[ -f "$exe" ]] || continue
+            while IFS= read -r dep; do
+              dep_lower=$(echo "$dep" | tr '[:upper:]' '[:lower:]')
+              if [[ -n "${bin_dlls[$dep_lower]+_}" && -z "${closure[$dep_lower]+_}" ]]; then
+                closure["$dep_lower"]=1
+                queue+=("$dep_lower")
+              fi
+            done < <(objdump -p "$exe" 2>/dev/null | awk '/DLL Name:/{print $3}')
+          done
 
-          sort -u -o runtime_dlls_windows.txt runtime_dlls_windows.txt
+          # BFS: expand through each newly discovered DLL in bin/
+          while [[ ${#queue[@]} -gt 0 ]]; do
+            current="${queue[0]}"
+            queue=("${queue[@]:1}")
+            dll_path="${bin_dlls[$current]}"
+            while IFS= read -r dep; do
+              dep_lower=$(echo "$dep" | tr '[:upper:]' '[:lower:]')
+              if [[ -n "${bin_dlls[$dep_lower]+_}" && -z "${closure[$dep_lower]+_}" ]]; then
+                closure["$dep_lower"]=1
+                queue+=("$dep_lower")
+              fi
+            done < <(objdump -p "$dll_path" 2>/dev/null | awk '/DLL Name:/{print $3}')
+          done
+
+          echo "Closure size: ${#closure[@]} DLLs required"
+
+          # Remove everything in bin/ that is not in the closure
+          removed=0
+          kept=0
+          while IFS= read -r dll_path; do
+            dll_lower=$(basename "$dll_path" | tr '[:upper:]' '[:lower:]')
+            if [[ -z "${closure[$dll_lower]+_}" ]]; then
+              echo "  Pruning: $(basename "$dll_path")"
+              rm -f "$dll_path"
+              removed=$((removed + 1))
+            else
+              kept=$((kept + 1))
+            fi
+          done < <(find "$BIN_DIR" -maxdepth 1 -name "*.dll")
+
+          echo "=== Pruned $removed, kept $kept ==="
+          echo "=== Final DLL list ==="
+          find "$BIN_DIR" -maxdepth 1 -name "*.dll" | sort | xargs -I{} basename {}
 
       - name: Package Windows Build (MinGW)
         shell: pwsh
@@ -228,7 +272,6 @@ jobs:
           mkdir dist
           mkdir temp_package
 
-          # Copy the built binaries (MinGW outputs to bin/ directly, not bin/Release/)
           $binDir = ".\citron\build\bin"
           if (Test-Path "$binDir\Release") { $binDir = "$binDir\Release" }
 
@@ -242,17 +285,6 @@ jobs:
             Copy-Item $_.FullName $destPath -Force
           }
 
-          # Copy runtime DLLs resolved via ldd (MSYS2 + vcpkg dynamic dependencies)
-          $dllList = ".\citron\runtime_dlls_windows.txt"
-          if (Test-Path $dllList) {
-            Get-Content $dllList | ForEach-Object {
-              $dllPath = $_.Trim()
-              if ($dllPath -and (Test-Path $dllPath)) {
-                Copy-Item $dllPath ".\temp_package\" -Force
-              }
-            }
-          }
-
           Compress-Archive -Path ".\temp_package\*" -DestinationPath ".\dist\Citron-windows-nightly-${{ steps.version.outputs.VERSION }}-x64-mingw.zip"
           Remove-Item ".\temp_package" -Recurse -Force
 

.github/workflows/build_nightly.yml

@@ -646,144 +646,11 @@ jobs:
           path: "dist/*.dmg"
 
   # ===========================================================================
-  # WINDOWS (MinGW)
+  # WINDOWS: MinGW + MSVC nightly builds and the nightly-windows GitHub Release
+  # are handled exclusively by .github/workflows/build-windows.yml (same cron).
+  # A duplicate release job here used to run after that workflow and recreate
+  # nightly-windows with only the MinGW zip, dropping the MSVC asset.
   # ===========================================================================
-  build-windows:
-    name: "Citron Build (Windows MinGW - x64)"
-    needs: [check-version]
-    if: needs.check-version.outputs.should_build == 'true'
-    runs-on: windows-latest
-    timeout-minutes: 180
-
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          update: true
-          install: >-
-            mingw-w64-ucrt-x86_64-toolchain
-            mingw-w64-ucrt-x86_64-cmake
-            mingw-w64-ucrt-x86_64-ninja
-            mingw-w64-ucrt-x86_64-qt6-base
-            mingw-w64-ucrt-x86_64-qt6-tools
-            mingw-w64-ucrt-x86_64-qt6-multimedia
-            mingw-w64-ucrt-x86_64-qt6-translations
-            mingw-w64-ucrt-x86_64-SDL2
-            mingw-w64-ucrt-x86_64-vulkan-headers
-            mingw-w64-ucrt-x86_64-vulkan-loader
-            mingw-w64-ucrt-x86_64-vulkan-utility-libraries
-            mingw-w64-ucrt-x86_64-vulkan-memory-allocator
-            mingw-w64-ucrt-x86_64-openssl
-            mingw-w64-ucrt-x86_64-boost
-            mingw-w64-ucrt-x86_64-nlohmann-json
-            mingw-w64-ucrt-x86_64-zlib
-            mingw-w64-ucrt-x86_64-zstd
-            mingw-w64-ucrt-x86_64-lz4
-            mingw-w64-ucrt-x86_64-ffmpeg
-            mingw-w64-ucrt-x86_64-opus
-            mingw-w64-ucrt-x86_64-libusb
-            mingw-w64-ucrt-x86_64-openal
-            git
-            base-devel
-
-      - name: Clone Citron Source
-        run: |
-          ATTEMPT=0
-          MAX_ATTEMPTS=999
-          while true; do
-            ATTEMPT=$((ATTEMPT + 1))
-            echo "Attempt $ATTEMPT of $MAX_ATTEMPTS: Cloning Citron..."
-            rm -rf citron
-            if git clone --recursive "https://github.com/citron-neo/emulator.git" citron; then
-              echo "Clone successful on attempt $ATTEMPT."
-              break
-            fi
-            if [ $ATTEMPT -ge $MAX_ATTEMPTS ]; then
-              echo "Failed after $MAX_ATTEMPTS attempts."; exit 1
-            fi
-            echo "Clone failed. Retrying in 15 seconds..."
-            sleep 15
-          done
-
-      - name: Cache build directory
-        uses: actions/cache@v4
-        id: cache-build
-        with:
-          path: ./citron/build
-          key: mingw-build-${{ runner.os }}-${{ hashFiles('citron/CMakeLists.txt') }}
-          restore-keys: |
-            mingw-build-${{ runner.os }}-
-
-      - name: Get Nightly Version
-        id: version
-        working-directory: ./citron
-        run: |
-          git fetch --tags
-          VERSION=$(git rev-parse --short HEAD)
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-
-      - name: Configure CMake
-        working-directory: ./citron
-        run: |
-          cmake -B build -S . -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCITRON_USE_BUNDLED_VCPKG=ON \
-            -DCITRON_USE_BUNDLED_QT=OFF \
-            -DCITRON_USE_BUNDLED_FFMPEG=OFF \
-            -DCITRON_USE_EXTERNAL_SDL2=ON \
-            -DCITRON_USE_EXTERNAL_VULKAN_HEADERS=ON \
-            -DCITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES=ON \
-            -DCITRON_BUILD_TYPE=Nightly \
-            -DCITRON_TESTS=OFF \
-            -DENABLE_QT=ON \
-            -DENABLE_QT6=ON \
-            -DENABLE_SDL2=ON \
-            -DENABLE_WEB_SERVICE=ON \
-            -DENABLE_OPENSSL=ON \
-            -DENABLE_CUBEB=OFF \
-            -DENABLE_OPENAL=ON \
-            -DENABLE_LIBUSB=ON \
-            -DUSE_DISCORD_PRESENCE=OFF \
-            -DCITRON_USE_AUTO_UPDATER=OFF \
-            -DCITRON_USE_PRECOMPILED_HEADERS=ON
-
-      - name: Build Citron
-        working-directory: ./citron
-        run: cmake --build build --config Release -j$(nproc)
-
-      - name: Package Windows Build
-        shell: pwsh
-        run: |
-          mkdir dist
-          mkdir temp_package
-          $binDir = ".\citron\build\bin"
-          if (Test-Path "$binDir\Release") { $binDir = "$binDir\Release" }
-          Get-ChildItem $binDir -Recurse | Where-Object {
-            $_.Extension -ne ".pdb" -and $_.Extension -ne ".a" -and $_.Extension -ne ".o"
-          } | ForEach-Object {
-            $relativePath = $_.FullName.Replace((Resolve-Path $binDir).Path, "").TrimStart('\')
-            $destPath = Join-Path ".\temp_package" $relativePath
-            $destDir = Split-Path $destPath -Parent
-            if (!(Test-Path $destDir)) { New-Item -ItemType Directory -Path $destDir -Force | Out-Null }
-            Copy-Item $_.FullName $destPath -Force
-          }
-          Compress-Archive -Path ".\temp_package\*" -DestinationPath ".\dist\Citron-windows-nightly-${{ steps.version.outputs.VERSION }}-x64-mingw.zip"
-          Remove-Item ".\temp_package" -Recurse -Force
-
-      - name: Upload Windows Build
-        uses: actions/upload-artifact@v4
-        with:
-          name: Citron-Windows-Nightly-x64
-          path: "dist/*.zip"
 
   # ===========================================================================
   # RELEASE - Android
@@ -1017,73 +884,3 @@ jobs:
           curl -H "Content-Type: application/json" \
                -d "{\"content\":\"🍎 **New macOS Nightly Build!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔗 **Download:** $DOWNLOAD_URL\"}" \
                "$WEBHOOK_URL"
-
-  # ===========================================================================
-  # RELEASE - Windows
-  # ===========================================================================
-  release-windows:
-    if: ${{ github.ref_name == 'main' }}
-    name: "Release Windows Nightly"
-    needs: [check-version, build-windows]
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: Citron-Windows-Nightly-x64
-          path: .
-      - name: Get Version from Filename
-        shell: bash
-        run: |
-          FILENAME=$(ls Citron-windows-nightly-*-x64-mingw.zip)
-          VERSION=${FILENAME#Citron-windows-nightly-}
-          VERSION=${VERSION%-x64-mingw.zip}
-          echo "APP_VERSION=${VERSION}" >> $GITHUB_ENV
-      - name: Delete Previous Release
-        run: gh release delete "nightly-windows" --repo "${{ github.repository }}" --cleanup-tag -y || true
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set Build Date
-        run: echo "BUILD_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
-      - name: Release Artifacts
-        uses: softprops/action-gh-release@v2
-        with:
-          name: "Continuous Build (Windows Nightly: ${{ env.APP_VERSION }})"
-          tag_name: "nightly-windows"
-          prerelease: false
-          files: "*.zip"
-          body: |
-            **Citron Upstream Commit:** [`${{ needs.check-version.outputs.new_hash }}`](https://github.com/citron-neo/emulator/commit/${{ needs.check-version.outputs.new_hash_full }})
-
-            This build is based on the latest Citron emulator source code from the upstream repository.
-
-            **Build Details:**
-            - Platform: Windows (x64)
-            - Toolchain: MinGW-w64 (MSYS2 UCRT64)
-            - Build Type: Nightly
-            - Date: ${{ env.BUILD_DATE }}
-      - name: Update LATEST_VERSION
-        if: success()
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          echo "${{ env.APP_VERSION }}" > LATEST_VERSION
-          git add LATEST_VERSION
-          git commit -m "Update LATEST_VERSION to ${{ env.APP_VERSION }} [skip ci]" || exit 0
-          for i in {1..5}; do
-            git pull --rebase origin main && git push && break || sleep 2
-          done
-      - name: Post to Discord
-        if: success()
-        run: |
-          DOWNLOAD_URL="https://github.com/${{ github.repository }}/releases/tag/nightly-windows"
-          DATE=$(date +'%Y-%m-%d')
-          WEBHOOK_URL="${{ secrets.DISCORD_WEBHOOK }}"
-          if [ -z "$WEBHOOK_URL" ]; then echo "DISCORD_WEBHOOK is not set; skipping."; exit 0; fi
-          curl -H "Content-Type: application/json" \
-               -d "{\"content\":\"🪟 **New Windows Nightly Build!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔧 **Toolchain:** MinGW-w64 (UCRT64)\n🔗 **Download:** $DOWNLOAD_URL\"}" \
-               "$WEBHOOK_URL"

LATEST_VERSION

@@ -1 +1 @@
-b57795d
+3866aa6b0

LATEST_VERSION_MACOS

@@ -1 +1 @@
-b57795d31
+3866aa6b0