Revert "ci(linux): migrate CI builds to build-citron-linux.sh"

Update LATEST_VERSION to ca6d997 [skip ci]
Update LATEST_VERSION_MACOS to ca6d997c1 [skip ci]
2026-07-05 15:21:59 -07:00 · 2026-07-03 14:15:25 +10:00 · 2026-07-02 22:10:36 +00:00 · 2026-07-02 22:00:36 +00:00 · 2026-07-03 07:36:04 +10:00 · 2026-07-02 13:21:02 +10:00
11 changed files with 215 additions and 550 deletions
@@ -2,8 +2,6 @@ name: Build Citron (Android)

 on:
  workflow_dispatch:
-  schedule:
-    - cron: "0 12 * * *"

 jobs:
  check-version:
@@ -181,7 +179,7 @@ jobs:
          export ANDROID_NDK="$ANDROID_NDK_HOME"
          chmod +x gradlew
          ./gradlew assembleMainlineRelease \
-            -Pcmake.args="-DENABLE_QT=OFF -DENABLE_SDL2=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_OPENSSL=OFF -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCITRON_ENABLE_LTO=ON -DCITRON_BUILD_TYPE=Release"
+            -Pcmake.args="-DENABLE_QT=OFF -DENABLE_SDL2=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_OPENSSL=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCITRON_ENABLE_LTO=ON -DCITRON_BUILD_TYPE=Release"

      - name: Upload APK artifact
        uses: actions/upload-artifact@v4
@@ -340,7 +338,7 @@ jobs:
          export ANDROID_NDK="$ANDROID_NDK_HOME"
          chmod +x ./gradlew
          ./gradlew assembleMainlineRelease \
-            -Pcmake.args="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_UPDATE_CHECKER=ON -DENABLE_QT=OFF -DENABLE_SDL2=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_OPENSSL=OFF -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCITRON_ENABLE_LTO=ON -DCITRON_BUILD_TYPE=Release"
+            -Pcmake.args="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_UPDATE_CHECKER=ON -DENABLE_QT=OFF -DENABLE_SDL2=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_OPENSSL=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCITRON_ENABLE_LTO=ON -DCITRON_BUILD_TYPE=Release"
          
          APK_PATH=$(find app/build/outputs/apk -type f -name "*.apk" | head -n 1)
          if [ -z "$APK_PATH" ]; then
@@ -5,8 +5,6 @@ concurrency:
  cancel-in-progress: true

 on:
-  schedule:
-    - cron: "0 12 * * *"
  workflow_dispatch: {}

 jobs:
@@ -5,8 +5,6 @@ concurrency:
  cancel-in-progress: true

 on:
-  schedule:
-    - cron: "0 14 * * *"
  workflow_dispatch: {}

 jobs:
@@ -5,8 +5,6 @@ concurrency:
  cancel-in-progress: true

 on:
-  schedule:
-    - cron: "0 12 * * *"
  workflow_dispatch: {}

 jobs:
@@ -55,54 +53,23 @@ jobs:
            echo "should_build=false" >> $GITHUB_OUTPUT
          fi

-  build-mingw:
-    name: "Citron Build (Windows MinGW - x64)"
+
+
+  build-clangtron:
+    name: "Citron Build (Windows Clangtron - x64)"
    needs: [check-version]
    if: needs.check-version.outputs.should_build == 'true'
-    runs-on: windows-latest
-    timeout-minutes: 180
-
-    defaults:
-      run:
-        shell: msys2 {0}
+    runs-on: ubuntu-latest
+    timeout-minutes: 240
+    env:
+      CPM_SOURCE_CACHE: /home/runner/.cache/cpm

    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 (MinGW)
+      - name: Clone Citron Source (Clangtron)
        run: |
          ATTEMPT=0
          MAX_ATTEMPTS=999
@@ -112,7 +79,7 @@ jobs:

            rm -rf citron

-            if git clone --recursive "https://github.com/citron-neo/emulator.git" citron; then
+            if git clone "https://github.com/citron-neo/emulator.git" citron; then
              echo "Clone successful on attempt $ATTEMPT."
              break
            fi
@@ -126,16 +93,21 @@ jobs:
            sleep 15
          done

-      - name: Cache build directory (MinGW)
-        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: Init required submodules
+        working-directory: ./citron
+        run: |
+          echo "CPM manages all dependencies — no submodules needed for Clangtron"

-      - name: Get Version (MinGW)
+      - name: Cache CPM and Toolchain (Clangtron)
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/.cache/cpm
+          key: clangtron-cache-${{ runner.os }}-${{ hashFiles('citron/CMakeModules/dependencies.cmake', 'citron/build-clangtron-windows.sh') }}
+          restore-keys: |
+            clangtron-cache-${{ runner.os }}-
+
+
+      - name: Get Version (Clangtron)
        id: version
        working-directory: ./citron
        run: |
@@ -143,238 +115,48 @@ jobs:
          VERSION=$(git rev-parse --short HEAD)
          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT

-      - name: Configure CMake (MinGW)
+      - name: Skip BOLT build (not needed for --pgo none)
+        run: |
+          echo '#!/bin/bash' | sudo tee /usr/local/bin/llvm-bolt-21
+          echo '#!/bin/bash' | sudo tee /usr/local/bin/merge-fdata-21
+          sudo chmod +x /usr/local/bin/llvm-bolt-21
+          sudo chmod +x /usr/local/bin/merge-fdata-21
+
+
+      - name: Setup Clangtron Build Environment
        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=Release \
-            -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
+          chmod +x build-clangtron-windows.sh
+          ./build-clangtron-windows.sh setup
+          echo "${HOME}/.cache/cpm/llvm-mingw/bin" >> "$GITHUB_PATH"

-      - name: Build Citron (MinGW)
-        working-directory: ./citron
-        run: cmake --build build --config Release -j$(nproc)
-
-      - name: Collect runtime DLL dependencies (MinGW)
+      - name: Build Citron (Clangtron LTO)
        working-directory: ./citron
        run: |
-          set -e
-          BIN_DIR="./build/bin"
-          if [ -d "$BIN_DIR/Release" ]; then
-            BIN_DIR="$BIN_DIR/Release"
-          fi
+          export CITRON_BUILD_TYPE=Release
+          ./build-clangtron-windows.sh use --pgo none --lto full

-          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
-
-          if [ -z "$TARGET_EXE" ] || [ ! -f "$TARGET_EXE" ]; then
-            echo "Could not find built executable in $BIN_DIR"
+      - name: Package Windows Build (Clangtron)
+        run: |
+          mkdir -p dist
+          BIN_DIR="./citron/build/use-nopgo/bin"
+          if [ ! -d "$BIN_DIR" ]; then
+            echo "::error::Build output not found at $BIN_DIR"
            exit 1
          fi
+          cd "$BIN_DIR"
+          zip -r "${GITHUB_WORKSPACE}/dist/Citron-windows-nightly-${{ steps.version.outputs.VERSION }}-x64-clangtron.zip" .

-          VCPKG_BIN="$PWD/build/vcpkg_installed/x64-mingw-dynamic/bin"
-          UCRT_BIN="/ucrt64/bin"
-          : > runtime_dlls_windows.txt
-
-          # 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
-
-                if [ -n "$found" ]; then
-                  cygpath -w "$found" >> runtime_dlls_windows.txt
-                fi
-              done
-
-          # 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
-
-          sort -u -o runtime_dlls_windows.txt runtime_dlls_windows.txt
-
-      - name: Package Windows Build (MinGW)
-        shell: pwsh
-        run: |
-          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" }
-
-          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
-          }
-
-          # 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
-
-      - name: Upload Windows Build (MinGW)
+      - name: Upload Windows Build (Clangtron)
        uses: actions/upload-artifact@v4
        with:
-          name: Citron-Windows-Nightly-Mingw-x64
-          path: "dist/*.zip"
-
-  build-msvc:
-    name: "Citron Build (Windows MSVC - x64)"
-    needs: [check-version]
-    if: needs.check-version.outputs.should_build == 'true'
-    runs-on: windows-latest
-    timeout-minutes: 180
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Install Vulkan SDK
-        shell: pwsh
-        run: |
-          $vulkan_sdk_url = "https://sdk.lunarg.com/sdk/download/1.3.283.0/windows/VulkanSDK-1.3.283.0-Installer.exe"
-          Invoke-WebRequest -Uri $vulkan_sdk_url -OutFile VulkanSDK-Installer.exe
-          Start-Process -FilePath ".\VulkanSDK-Installer.exe" -ArgumentList "--accept-licenses", "--default-answer", "--confirm-command", "install" -Wait
-          echo "C:\VulkanSDK\1.3.283.0\Bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-
-      - name: Clone Citron Source (MSVC)
-        shell: bash
-        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 vcpkg and Qt dependencies (MSVC)
-        uses: actions/cache@v4
-        id: cache-vcpkg
-        with:
-          path: |
-            ./citron/build
-            ~/.vcpkg/archives
-            ${{ env.LOCALAPPDATA }}\vcpkg\archives
-          key: vcpkg-qt-cache-x64-${{ runner.os }}-${{ hashFiles('citron/vcpkg.json') }}-${{ hashFiles('citron/externals/vcpkg/.git/HEAD') }}
-          restore-keys: |
-            vcpkg-qt-cache-x64-${{ runner.os }}-${{ hashFiles('citron/vcpkg.json') }}-
-
-      - name: Get Version (MSVC)
-        id: version
-        working-directory: ./citron
-        shell: bash
-        run: |
-          git fetch --tags
-          VERSION=$(git rev-parse --short HEAD)
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-
-      - name: Configure CMake (MSVC)
-        working-directory: ./citron
-        shell: cmd
-        run: |
-          cmake -B build -S . -G "Visual Studio 17 2022" -A x64 ^
-            -DCITRON_USE_BUNDLED_VCPKG=ON ^
-            -DCITRON_BUILD_TYPE=Release ^
-            -DCITRON_ENABLE_LTO=ON ^
-            -DCITRON_USE_BUNDLED_QT=ON ^
-            -DENABLE_QT6=ON ^
-            -DCITRON_TESTS=OFF ^
-            -DUSE_DISCORD_PRESENCE=ON ^
-            -DENABLE_WEB_SERVICE=ON ^
-            -DENABLE_OPENSSL=ON ^
-            -DCITRON_USE_AUTO_UPDATER=ON ^
-            -DCITRON_ENABLE_LIBARCHIVE=ON
-
-      - name: Build Citron (MSVC)
-        working-directory: ./citron
-        shell: cmd
-        run: cmake --build build --config Release --parallel
-
-      - name: Package Windows Build (MSVC)
-        shell: pwsh
-        run: |
-          mkdir dist
-          mkdir temp_package
-          Get-ChildItem ".\citron\build\bin\Release\" -Recurse | Where-Object { $_.Extension -ne ".pdb" } | ForEach-Object {
-            $relativePath = $_.FullName.Replace((Resolve-Path ".\citron\build\bin\Release\").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-msvc.zip"
-          Remove-Item ".\temp_package" -Recurse -Force
-
-      - name: Upload Windows Build (MSVC)
-        uses: actions/upload-artifact@v4
-        with:
-          name: Citron-Windows-Nightly-MSVC-x64
+          name: Citron-Windows-Nightly-Clangtron-x64
          path: "dist/*.zip"

  release:
    if: ${{ github.ref_name == 'main' }}
    name: "Release"
-    needs: [check-version, build-mingw, build-msvc]
+    needs: [check-version, build-clangtron]
    permissions:
      contents: write
    runs-on: ubuntu-latest
@@ -390,9 +172,9 @@ jobs:
      - name: Get Version from Filename
        shell: bash
        run: |
-          FILENAME=$(basename "$(ls ./release-artifacts/Citron-windows-nightly-*-x64-mingw.zip)")
+          FILENAME=$(basename "$(ls ./release-artifacts/Citron-windows-nightly-*-x64-clangtron.zip)")
          VERSION=${FILENAME#Citron-windows-nightly-}
-          VERSION=${VERSION%-x64-mingw.zip}
+          VERSION=${VERSION%-x64-clangtron.zip}
          echo "APP_VERSION=${VERSION}" >> $GITHUB_ENV
      - name: Delete Previous Release
        run: gh release delete "nightly-windows" --repo "${{ github.repository }}" --cleanup-tag -y || true
@@ -407,8 +189,7 @@ jobs:
          tag_name: "nightly-windows"
          prerelease: false
          files: |
-            release-artifacts/*-x64-mingw.zip
-            release-artifacts/*-x64-msvc.zip
+            release-artifacts/*-x64-clangtron.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 }})

@@ -416,7 +197,7 @@ jobs:

            **Build Details:**
            - Platform: Windows (x64)
-            - Toolchains: MinGW-w64 (MSYS2 UCRT64) + MSVC (Visual Studio 2022)
+            - Toolchain: Clangtron (Clang LTO cross-compiled from Linux)
            - Build Type: Release
            - Date: ${{ env.BUILD_DATE }}
      - name: Update LATEST_VERSION
@@ -442,5 +223,5 @@ jobs:
            exit 0
          fi
          curl -H "Content-Type: application/json" \
-               -d "{\"content\":\"🪟 **New Windows Builds Available!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔧 **Toolchains:** MinGW-w64 (UCRT64) + MSVC\n🔗 **Download:** $DOWNLOAD_URL\"}" \
+               -d "{\"content\":\"🪟 **New Windows Build Available!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔧 **Toolchain:** Clangtron (Clang LTO)\n🔗 **Download:** $DOWNLOAD_URL\"}" \
               "$WEBHOOK_URL"
@@ -645,85 +645,63 @@ jobs:
          name: Citron-macOS-Nightly
          path: "dist/*.dmg"

+
  # ===========================================================================
-  # WINDOWS (MinGW)
+  # WINDOWS (Clangtron)
  # ===========================================================================
-  build-windows:
-    name: "Citron Build (Windows MinGW - x64)"
+  build-windows-clangtron:
+    name: "Citron Build (Windows Clangtron - x64)"
    needs: [check-version]
    if: needs.check-version.outputs.should_build == 'true'
-    runs-on: windows-latest
-    timeout-minutes: 180
-
-    defaults:
-      run:
-        shell: msys2 {0}
+    runs-on: ubuntu-latest
+    timeout-minutes: 240
+    env:
+      CPM_SOURCE_CACHE: /home/runner/.cache/cpm

    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
+      - name: Clone Citron Source (Clangtron)
        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
+
+            if git clone "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
+              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: Init required submodules
+        working-directory: ./citron
+        run: |
+          echo "CPM manages all dependencies — no submodules needed for Clangtron"

-      - name: Get Nightly Version
+      - name: Cache CPM and Toolchain (Clangtron)
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/.cache/cpm
+          key: clangtron-cache-${{ runner.os }}-${{ hashFiles('citron/CMakeModules/dependencies.cmake', 'citron/build-clangtron-windows.sh') }}
+          restore-keys: |
+            clangtron-cache-${{ runner.os }}-
+
+
+      - name: Get Version (Clangtron)
        id: version
        working-directory: ./citron
        run: |
@@ -731,58 +709,42 @@ jobs:
          VERSION=$(git rev-parse --short HEAD)
          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT

-      - name: Configure CMake
+      - name: Skip BOLT build (not needed for --pgo none)
+        run: |
+          echo '#!/bin/bash' | sudo tee /usr/local/bin/llvm-bolt-21
+          echo '#!/bin/bash' | sudo tee /usr/local/bin/merge-fdata-21
+          sudo chmod +x /usr/local/bin/llvm-bolt-21
+          sudo chmod +x /usr/local/bin/merge-fdata-21
+
+
+      - name: Setup Clangtron Build Environment
        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
+          chmod +x build-clangtron-windows.sh
+          ./build-clangtron-windows.sh setup
+          echo "${HOME}/.cache/cpm/llvm-mingw/bin" >> "$GITHUB_PATH"

-      - name: Build Citron
+      - name: Build Citron (Clangtron LTO)
        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
+          export CITRON_BUILD_TYPE=Nightly
+          ./build-clangtron-windows.sh use --pgo none --lto full

-      - name: Upload Windows Build
+      - name: Package Windows Build (Clangtron)
+        run: |
+          mkdir -p dist
+          BIN_DIR="./citron/build/use-nopgo/bin"
+          if [ ! -d "$BIN_DIR" ]; then
+            echo "::error::Build output not found at $BIN_DIR"
+            exit 1
+          fi
+          cd "$BIN_DIR"
+          zip -r "${GITHUB_WORKSPACE}/dist/Citron-windows-nightly-${{ steps.version.outputs.VERSION }}-x64-clangtron.zip" .
+
+      - name: Upload Windows Build (Clangtron)
        uses: actions/upload-artifact@v4
        with:
-          name: Citron-Windows-Nightly-x64
+          name: Citron-Windows-Nightly-Clangtron-x64
          path: "dist/*.zip"

  # ===========================================================================
@@ -1024,7 +986,7 @@ jobs:
  release-windows:
    if: ${{ github.ref_name == 'main' }}
    name: "Release Windows Nightly"
-    needs: [check-version, build-windows]
+    needs: [check-version, build-windows-clangtron]
    permissions:
      contents: write
    runs-on: ubuntu-latest
@@ -1032,16 +994,18 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+      - name: Download Windows artifacts
+        uses: actions/download-artifact@v4
        with:
-          name: Citron-Windows-Nightly-x64
+          pattern: Citron-Windows-Nightly-*
+          merge-multiple: true
          path: .
      - name: Get Version from Filename
        shell: bash
        run: |
-          FILENAME=$(ls Citron-windows-nightly-*-x64-mingw.zip)
+          FILENAME=$(ls Citron-windows-nightly-*-x64-clangtron.zip)
          VERSION=${FILENAME#Citron-windows-nightly-}
-          VERSION=${VERSION%-x64-mingw.zip}
+          VERSION=${VERSION%-x64-clangtron.zip}
          echo "APP_VERSION=${VERSION}" >> $GITHUB_ENV
      - name: Delete Previous Release
        run: gh release delete "nightly-windows" --repo "${{ github.repository }}" --cleanup-tag -y || true
@@ -1055,7 +1019,8 @@ jobs:
          name: "Continuous Build (Windows Nightly: ${{ env.APP_VERSION }})"
          tag_name: "nightly-windows"
          prerelease: false
-          files: "*.zip"
+          files: |
+            *-x64-clangtron.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 }})

@@ -1063,7 +1028,7 @@ jobs:

            **Build Details:**
            - Platform: Windows (x64)
-            - Toolchain: MinGW-w64 (MSYS2 UCRT64)
+            - Toolchain: Clangtron (Clang LTO cross-compiled from Linux)
            - Build Type: Nightly
            - Date: ${{ env.BUILD_DATE }}
      - name: Update LATEST_VERSION
@@ -1085,5 +1050,5 @@ jobs:
          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\"}" \
+               -d "{\"content\":\"🪟 **New Windows Nightly Build!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔧 **Toolchain:** Clangtron (Clang LTO)\n🔗 **Download:** $DOWNLOAD_URL\"}" \
               "$WEBHOOK_URL"
@@ -644,85 +644,63 @@ jobs:
          name: Citron-macOS-Stable
          path: "dist/*.dmg"

+
  # ===========================================================================
-  # WINDOWS (MinGW)
+  # WINDOWS (Clangtron - Clang LTO cross-compiled from Ubuntu)
  # ===========================================================================
-  build-windows:
-    name: "Citron Build (Windows MinGW - x64)"
+  build-windows-clangtron:
+    name: "Citron Build (Windows Clangtron - x64)"
    needs: [check-version]
    if: needs.check-version.outputs.should_build == 'true'
-    runs-on: windows-latest
-    timeout-minutes: 180
-
-    defaults:
-      run:
-        shell: msys2 {0}
+    runs-on: ubuntu-latest
+    timeout-minutes: 240
+    env:
+      CPM_SOURCE_CACHE: /home/runner/.cache/cpm

    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
+      - name: Clone Citron Source (Clangtron)
        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
+
+            if git clone "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
+              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-stable-${{ runner.os }}-${{ hashFiles('citron/CMakeLists.txt') }}
-          restore-keys: |
-            mingw-build-stable-${{ runner.os }}-
+      - name: Init required submodules
+        working-directory: ./citron
+        run: |
+          echo "CPM manages all dependencies — no submodules needed for Clangtron"

-      - name: Get Stable Version
+      - name: Cache CPM and Toolchain (Clangtron)
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/.cache/cpm
+          key: clangtron-cache-stable-${{ runner.os }}-${{ hashFiles('citron/CMakeModules/dependencies.cmake', 'citron/build-clangtron-windows.sh') }}
+          restore-keys: |
+            clangtron-cache-stable-${{ runner.os }}-
+
+
+      - name: Get Version (Clangtron)
        id: version
        working-directory: ./citron
        run: |
@@ -730,58 +708,42 @@ jobs:
          VERSION=$(git rev-parse --short HEAD)
          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT

-      - name: Configure CMake
+
+      - name: Skip BOLT build (not needed for --pgo none)
+        run: |
+          echo '#!/bin/bash' | sudo tee /usr/local/bin/llvm-bolt-21
+          echo '#!/bin/bash' | sudo tee /usr/local/bin/merge-fdata-21
+          sudo chmod +x /usr/local/bin/llvm-bolt-21
+          sudo chmod +x /usr/local/bin/merge-fdata-21
+
+      - name: Setup Clangtron Build Environment
        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=Stable \
-            -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
+          chmod +x build-clangtron-windows.sh
+          ./build-clangtron-windows.sh setup
+          echo "${HOME}/.cache/cpm/llvm-mingw/bin" >> "$GITHUB_PATH"

-      - name: Build Citron
+      - name: Build Citron (Clangtron LTO)
        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-stable-${{ steps.version.outputs.VERSION }}-x64-mingw.zip"
-          Remove-Item ".\temp_package" -Recurse -Force
+          export CITRON_BUILD_TYPE=Stable
+          ./build-clangtron-windows.sh use --pgo none --lto full

-      - name: Upload Windows Build
+      - name: Package Windows Build (Clangtron)
+        run: |
+          mkdir -p dist
+          BIN_DIR="./citron/build/use-nopgo/bin"
+          if [ ! -d "$BIN_DIR" ]; then
+            echo "::error::Build output not found at $BIN_DIR"
+            exit 1
+          fi
+          cd "$BIN_DIR"
+          zip -r "${GITHUB_WORKSPACE}/dist/Citron-windows-stable-${{ steps.version.outputs.VERSION }}-x64-clangtron.zip" .
+
+      - name: Upload Windows Build (Clangtron)
        uses: actions/upload-artifact@v4
        with:
-          name: Citron-Windows-Stable-x64
+          name: Citron-Windows-Stable-Clangtron-x64
          path: "dist/*.zip"

  # ===========================================================================
@@ -1023,7 +985,7 @@ jobs:
  release-windows:
    if: ${{ github.ref_name == 'main' }}
    name: "Release Windows Stable"
-    needs: [check-version, build-windows]
+    needs: [check-version, build-windows-clangtron]
    permissions:
      contents: write
    runs-on: ubuntu-latest
@@ -1031,16 +993,18 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+      - name: Download Windows artifacts
+        uses: actions/download-artifact@v4
        with:
-          name: Citron-Windows-Stable-x64
+          pattern: Citron-Windows-Stable-*
+          merge-multiple: true
          path: .
      - name: Get Version from Filename
        shell: bash
        run: |
-          FILENAME=$(ls Citron-windows-stable-*-x64-mingw.zip)
+          FILENAME=$(ls Citron-windows-stable-*-x64-clangtron.zip)
          VERSION=${FILENAME#Citron-windows-stable-}
-          VERSION=${VERSION%-x64-mingw.zip}
+          VERSION=${VERSION%-x64-clangtron.zip}
          echo "APP_VERSION=${VERSION}" >> $GITHUB_ENV
      - name: Delete Previous Release
        run: gh release delete "stable-windows" --repo "${{ github.repository }}" --cleanup-tag -y || true
@@ -1054,7 +1018,8 @@ jobs:
          name: "Stable Release (Windows Stable: ${{ env.APP_VERSION }})"
          tag_name: "stable-windows"
          prerelease: false
-          files: "*.zip"
+          files: |
+            *-x64-clangtron.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 }})

@@ -1062,7 +1027,7 @@ jobs:

            **Build Details:**
            - Platform: Windows (x64)
-            - Toolchain: MinGW-w64 (MSYS2 UCRT64)
+            - Toolchain: Clangtron (Clang LTO cross-compiled from Linux)
            - Build Type: Stable
            - Date: ${{ env.BUILD_DATE }}
      - name: Update LATEST_VERSION
@@ -1084,5 +1049,6 @@ jobs:
          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 Stable Release!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔧 **Toolchain:** MinGW-w64 (UCRT64)\n🔗 **Download:** $DOWNLOAD_URL\"}" \
+               -d "{\"content\":\"🪟 **New Windows Stable Release!**\n\n📦 **Version:** \`${{ env.APP_VERSION }}\`\n📅 **Date:** ${DATE}\n🔧 **Toolchain:** Clangtron (Clang LTO)\n🔗 **Download:** $DOWNLOAD_URL\"}" \
               "$WEBHOOK_URL"
+
@@ -1 +1 @@
-b57795d
+ca6d997
@@ -1 +1 @@
-b57795d31
+ca6d997c1
@@ -1,10 +1,8 @@
 # 🍋 The Official Citron-CI

 [![GitHub Downloads](https://img.shields.io/github/downloads/citron-neo/CI/total?logo=github&label=GitHub%20Downloads)](https://github.com/citron-neo/CI/releases/latest)
-[![Build Citron (Android)](https://github.com/citron-neo/CI/actions/workflows/build-android.yml/badge.svg)](https://github.com/citron-neo/CI/actions/workflows/build-android.yml)
-[![Build Citron (Windows)](https://github.com/citron-neo/CI/actions/workflows/build-windows.yml/badge.svg)](https://github.com/citron-neo/CI/actions/workflows/build-windows.yml)
-[![Build Citron (Linux)](https://github.com/citron-neo/CI/actions/workflows/build-linux.yml/badge.svg)](https://github.com/citron-neo/CI/actions/workflows/build-linux.yml)
-[![Build Citron (macOS)](https://github.com/citron-neo/CI/actions/workflows/build-macos.yml/badge.svg)](https://github.com/citron-neo/CI/actions/workflows/build-macos.yml)
+[![Build Citron (Nightly)](https://github.com/citron-neo/CI/actions/workflows/build_nightly.yml/badge.svg)](https://github.com/citron-neo/CI/actions/workflows/build_nightly.yml)
+[![Build Citron (Stable)](https://github.com/citron-neo/CI/actions/workflows/build_stable.yml/badge.svg)](https://github.com/citron-neo/CI/actions/workflows/build_stable.yml)

 ## Star History

@@ -2,6 +2,7 @@

 set -ex
 ARCH="$(uname -m)"
+EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"

 pacman -Syu --noconfirm --needed \
 	base-devel          \
@@ -13,34 +14,32 @@ pacman -Syu --noconfirm --needed \
 	curl                \
 	enet                \
 	fmt                 \
-	ffmpeg              \
 	gamemode            \
 	gcc                 \
 	git                 \
 	glslang             \
 	glu                 \
 	hidapi              \
-	libdecor            \
 	libvpx              \
 	libxi               \
 	libxkbcommon-x11    \
 	libxss              \
 	lld                 \
 	llvm                \
-	mbedtls2            \
+	rapidjson           \
 	mesa                \
 	nasm                \
 	ninja               \
 	nlohmann-json       \
 	numactl             \
 	openal              \
+	patchelf            \
 	pulseaudio          \
 	pulseaudio-alsa     \
-	qt6-base            \
 	qt6-networkauth     \
 	qt6-multimedia      \
+	qt6-svg             \
 	qt6-tools           \
-	qt6-wayland         \
 	qt6-translations    \
 	sdl2                \
 	unzip               \
@@ -54,3 +53,7 @@ pacman -Syu --noconfirm --needed \
 	xorg-server-xvfb    \
 	zip                 \
 	zsync
+
+wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" -O ./get-debloated-pkgs.sh
+chmod +x ./get-debloated-pkgs.sh
+./get-debloated-pkgs.sh --add-mesa ffmpeg-mini qt6-base-mini libxml2-mini opus-mini icu-mini
@@ -10,63 +10,21 @@ fi

 # Construct unique names for the AppImage and tarball based on the build matrix.
 OUTNAME_BASE="citron_nightly-${APP_VERSION}-linux-${ARCH}${ARCH_SUFFIX}"
-export OUTNAME_APPIMAGE="${OUTNAME_BASE}.AppImage"
-export OUTNAME_TAR="${OUTNAME_BASE}.tar.zst"

-URUNTIME="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/uruntime2appimage.sh"
 SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"
-
+export OUTNAME="${OUTNAME_BASE}.AppImage"
+export OUTPATH="$PWD"/dist
 export DESKTOP=/usr/share/applications/org.citron_emu.citron.desktop
 export ICON=/usr/share/icons/hicolor/scalable/apps/org.citron_emu.citron.svg
 export DEPLOY_OPENGL=1
 export DEPLOY_VULKAN=1
 export DEPLOY_PIPEWIRE=1

-wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
-chmod +x ./quick-sharun
-
-./quick-sharun /usr/bin/citron* /usr/lib/libgamemode.so* /usr/lib/libpulse.so*
-
-echo "Copying Qt translation files..."
-
-mkdir -p ./AppDir/usr/share/qt6
-
-cp -r /usr/share/qt6/translations ./AppDir/usr/share/qt6/
-
 if [ "$DEVEL" = 'true' ]; then
-	sed -i 's|Name=citron|Name=citron nightly|' ./AppDir/*.desktop
+	export DEVEL_RELEASE=1
 fi

-echo 'SHARUN_ALLOW_SYS_VK_ICD=1' > ./AppDir/.env
-
-
-echo "Creating tar.zst archive..."
-
-(cd AppDir && tar -c --zstd -f ../"$OUTNAME_TAR" usr)
-echo "Successfully created $OUTNAME_TAR"
-
-
-wget --retry-connrefused --tries=30 "$URUNTIME" -O ./uruntime2appimage
-chmod +x ./uruntime2appimage
-
-# Run the AppImage creation tool and capture its output to a variable.
-BUILD_OUTPUT=$(./uruntime2appimage)
-
-# Print the captured output to the logs for debugging purposes.
-echo "$BUILD_OUTPUT"
-
-# Automatically find the AppImage path from the output, strip any ANSI color codes,
-# and then use basename to get just the filename.
-SOURCE_APPIMAGE=$(basename "$(echo "$BUILD_OUTPUT" | grep "All done! AppImage at:" | awk '{print $NF}' | sed 's/\x1b\[[0-9;]*m//g')")
-
-echo "Discovered source AppImage: ${SOURCE_APPIMAGE}"
-echo "Renaming to final suffixed name: ${OUTNAME_APPIMAGE}..."
-
-# Now, use the dynamically discovered and cleaned filename for the move operations.
-mv -v "${SOURCE_APPIMAGE}" "${OUTNAME_APPIMAGE}"
-mv -v "${SOURCE_APPIMAGE}.zsync" "${OUTNAME_APPIMAGE}.zsync"
-
-mkdir -p ./dist
-
-mv -v ./*.AppImage* ./dist
-mv -v ./*.tar.zst ./dist
+wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
+chmod +x ./quick-sharun
+./quick-sharun /usr/bin/citron* /usr/lib/libgamemode.so*
+./quick-sharun --make-appimage