deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-05 12:13:34 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Python/PyInstaller build cleanup

Browse Source
This commit is contained in:
Ross Scroggs
2024-08-29 11:30:13 -07:00
parent 49128d5559
commit 0e90d10f17
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build.yml vendored
View File

@ -361,12 +361,7 @@ jobs:
cd "${GITHUB_WORKSPACE}/src" cd "${GITHUB_WORKSPACE}/src"
git clone https://github.com/python/cpython.git git clone https://github.com/python/cpython.git
cd "${PYTHON_SOURCE_PATH}" cd "${PYTHON_SOURCE_PATH}"
# Pin Windows to 3.11.6 for the moment
# if [[ "${RUNNER_OS}" == "Windows" ]]; then
# export LATEST_STABLE_TAG="v3.11.6"
# else
export LATEST_STABLE_TAG=$(git tag --list | grep -v a | grep -v rc | grep -v b | sort -Vr | head -n1) export LATEST_STABLE_TAG=$(git tag --list | grep -v a | grep -v rc | grep -v b | sort -Vr | head -n1)
# fi
git checkout "${LATEST_STABLE_TAG}" git checkout "${LATEST_STABLE_TAG}"
export COMPILED_PYTHON_VERSION=${LATEST_STABLE_TAG:1} # Trim the "v" prefix export COMPILED_PYTHON_VERSION=${LATEST_STABLE_TAG:1} # Trim the "v" prefix
echo "COMPILED_PYTHON_VERSION=${COMPILED_PYTHON_VERSION}" >> $GITHUB_ENV echo "COMPILED_PYTHON_VERSION=${COMPILED_PYTHON_VERSION}" >> $GITHUB_ENV
@ -504,16 +499,8 @@ jobs:
git clone https://github.com/pyinstaller/pyinstaller.git git clone https://github.com/pyinstaller/pyinstaller.git
cd pyinstaller cd pyinstaller
export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1)
#V6.0.0 causes errors on staticx
#if [[ "${staticx}" == "yes" ]]; then
# git checkout "v5.13.2"
#elif [[ "${RUNNER_OS}" == "Windows" ]]; then
# git checkout "v5.13.2"
#elif [[ "${RUNNER_OS}" == "macOS" ]]; then
# git checkout "v5.13.2"
#else
git checkout "${latest_release}" git checkout "${latest_release}"
#fi # git checkout "v6.9.0"
# remove pre-compiled bootloaders so we fail if bootloader compile fails # remove pre-compiled bootloaders so we fail if bootloader compile fails
rm -rvf PyInstaller/bootloader/*-*/* rm -rvf PyInstaller/bootloader/*-*/*
cd bootloader cd bootloader

3
src/gam.spec
View File

@ -18,7 +18,7 @@ datas += [('datastudio-v1.json', '.')]
datas += [('serviceaccountlookup-v1.json', '.')] datas += [('serviceaccountlookup-v1.json', '.')]
datas += [('cacerts.pem', '.')] datas += [('cacerts.pem', '.')]
hiddenimports = [ hiddenimports = [
'gam.auth.yubikey', 'gam.gamlib.yubikey',
] ]
a = Analysis( a = Analysis(
@ -117,4 +117,3 @@ else:
upx_exclude=[], upx_exclude=[],
name=name, name=name,
) )