From a628aeb1a8ea610feae31c6918ac643e04e454bd Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 17 Oct 2022 14:54:35 -0400 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0cd392f..19f51d5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -397,6 +397,25 @@ jobs: run: | "${PYTHON}" -V + - name: Install PyInstaller + if: matrix.goal == 'build' + run: | + 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}" + # remove pre-compiled bootloaders so we fail if bootloader compile fails + rm -rvf PyInstaller/bootloader/*-*/* + cd bootloader + if [[ "${arch}" == "Win32" ]]; then + export PYINSTALLER_BUILD_ARGS="--target-arch=32bit" + fi + echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}" + "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS + cd .. + echo "---- Installing PyInstaller ----" + "${PYTHON}" -m pip install . + - name: Upgrade pip, wheel, etc run: | curl -O https://bootstrap.pypa.io/get-pip.py @@ -423,25 +442,6 @@ jobs: "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list - - name: Install PyInstaller - if: matrix.goal == 'build' - run: | - 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}" - # remove pre-compiled bootloaders so we fail if bootloader compile fails - rm -rvf PyInstaller/bootloader/*-*/* - cd bootloader - if [[ "${arch}" == "Win32" ]]; then - export PYINSTALLER_BUILD_ARGS="--target-arch=32bit" - fi - echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}" - "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS - cd .. - echo "---- Installing PyInstaller ----" - "${PYTHON}" -m pip install . - - name: Build GAM with PyInstaller if: matrix.goal != 'test' run: |