From 4ad4711b848da7c725846e71fa9101b892e60443 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 10 Oct 2023 16:06:33 -0400 Subject: [PATCH] [no ci] actions: pyinstaller 5.3.2 for staticx, no openssl.props needed --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ba6dde0..4eb27f7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -404,7 +404,8 @@ jobs: run: | cd "${env:PYTHON_SOURCE_PATH}" # We need out custom openssl.props which uses OpenSSL 3 DLL names - Copy-Item -Path "${env:GITHUB_WORKSPACE}\src\tools\openssl.props" -Destination PCBuild\ -Verbose + # NOTE this should no longer be necessary post Python 3.12. + # Copy-Item -Path "${env:GITHUB_WORKSPACE}\src\tools\openssl.props" -Destination PCBuild\ -Verbose echo "Building for ${env:PYBUILDRELEASE_ARCH}..." PCBuild\build.bat -m --pgo -c Release -p "${env:PYBUILDRELEASE_ARCH}" @@ -479,9 +480,12 @@ jobs: git clone https://github.com/pyinstaller/pyinstaller.git cd pyinstaller export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) - git checkout "${latest_release}" - #V6.0.0 causes errors, comment above and uncomment below to use 5.13.2 - #git checkout "v5.13.2" + #V6.0.0 causes errors on staticx + if [[ "${staticx}" == "yes" ]]; then + git checkout "v5.13.2" + else + git checkout "${latest_release}" + fi # remove pre-compiled bootloaders so we fail if bootloader compile fails rm -rvf PyInstaller/bootloader/*-*/* cd bootloader