From 7645edee6ba72c04a8685993a3e5bf842001e91f Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 23 Sep 2024 21:08:09 -0400
Subject: [PATCH] actions: Windows back to onefile

---
 .github/workflows/build.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa10a0f5..a52897f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -543,7 +543,7 @@ jobs:
             # https://github.com/pyinstaller/pyinstaller/issues/7102
             export PATH="$(dirname ${PYTHON}):/usr/bin"
           fi
-          if [[ "${staticx}" != "yes" ]]; then
+          if ([ "${staticx}" != "yes" ] && [ "$RUNNER_OS" != "Windows" ]); then
             export PYINSTALLER_BUILD_ONEDIR=yes
           fi
           "${PYTHON}" -m PyInstaller --clean --noconfirm --distpath="${distpath}" gam.spec
@@ -675,10 +675,6 @@ jobs:
           GAM_ARCHIVE="${GITHUB_WORKSPACE}/gam-${GAMVERSION}-windows-${GAM_ARCHIVE_ARCH}.zip"
           /c/Program\ Files/7-Zip/7z.exe a -tzip "$GAM_ARCHIVE" gam7 "-xr@${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" -bb3
           cd ..
-          #$PYTHON tools/gen-wix-xml-filelist.py "$gampath" gam.wxs.template gam.wxs
-          #echo '-- begin generated gam.wxs --'
-          #cat gam.wxs
-          #echo '-- end generated gam.wxs --'
           export MSI_FILENAME="gam-${GAMVERSION}-windows-${GAM_ARCHIVE_ARCH}.msi"
           /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/candle.exe -arch "${WIX_ARCH}" gam.wxs
           /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/WixUIExtension.dll gam.wixobj -o "$MSI_FILENAME" || true;