ONEDIR for Windows and anything that's not StaticX

This commit is contained in:
Jay Lee
2024-09-20 01:11:21 +00:00
parent 64d4cc00e4
commit 26eca09bb9

View File

@@ -538,13 +538,11 @@ jobs:
# brew OpenSSL gets picked up by PyInstaller # brew OpenSSL gets picked up by PyInstaller
# breaking our self-compiled version # breaking our self-compiled version
brew uninstall --ignore-dependencies openssl brew uninstall --ignore-dependencies openssl
export PYINSTALLER_BUILD_ONEDIR=yes
elif [[ "${RUNNER_OS}" == "Windows" ]]; then elif [[ "${RUNNER_OS}" == "Windows" ]]; then
# Work around issue where PyInstaller picks up python3.dll from other Python versions # Work around issue where PyInstaller picks up python3.dll from other Python versions
# https://github.com/pyinstaller/pyinstaller/issues/7102 # https://github.com/pyinstaller/pyinstaller/issues/7102
export PATH="$(dirname ${PYTHON}):/usr/bin" export PATH="$(dirname ${PYTHON}):/usr/bin"
export PYINSTALLER_BUILD_ONEDIR=no if [[ "${staticx}" != "yes" ]]; then
elif [[ "${staticx}" != "yes" ]]; then
export PYINSTALLER_BUILD_ONEDIR=yes export PYINSTALLER_BUILD_ONEDIR=yes
fi fi
"${PYTHON}" -m PyInstaller --clean --noconfirm --distpath="${distpath}" gam.spec "${PYTHON}" -m PyInstaller --clean --noconfirm --distpath="${distpath}" gam.spec