deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GAM-team/GAM

Browse Source
This commit is contained in:
Ross Scroggs
2023-10-11 07:28:36 -07:00
parent 4b9a8cc235 4ae5cdee83
commit c7899ba401
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ jobs:
arch: x86_64 arch: x86_64
- os: ubuntu-22.04 - os: ubuntu-22.04
goal: test goal: test
python: "3.12" python: "3.11"
jid: 12 jid: 12
arch: x86_64 arch: x86_64
@@ -479,9 +479,12 @@ 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)
git checkout "${latest_release}" #V6.0.0 causes errors on staticx
#V6.0.0 causes errors, comment above and uncomment below to use 5.13.2 if [[ "${staticx}" == "yes" ]]; then
#git checkout "v5.13.2" git checkout "v5.13.2"
else
git checkout "${latest_release}"
fi
# 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
@@ -515,7 +518,8 @@ jobs:
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="/usr/bin" # export PATH="/usr/bin"
true
else else
export gampath=$(realpath "${gampath}") export gampath=$(realpath "${gampath}")
fi fi
@@ -528,6 +532,7 @@ jobs:
export distpath="./dist/gam" export distpath="./dist/gam"
export gampath="${distpath}" export gampath="${distpath}"
"${PYTHON}" -m PyInstaller --clean --noconfirm --distpath="${distpath}" gam.spec "${PYTHON}" -m PyInstaller --clean --noconfirm --distpath="${distpath}" gam.spec
cat build/gam/warn-gam.txt
- name: Copy extra package files - name: Copy extra package files
if: matrix.goal == 'build' if: matrix.goal == 'build'