deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 14:13:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ross Scroggs
2024-09-18 07:15:07 -07:00
parent abb49ed336 fe5bc5569d
commit bef392cf7a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ jobs:
arch: aarch64 arch: aarch64
openssl_archs: linux-aarch64 openssl_archs: linux-aarch64
staticx: yes staticx: yes
- os: macos-12 - os: macos-13
jid: 6 jid: 6
goal: build goal: build
arch: x86_64 arch: x86_64
@ -115,7 +115,7 @@ jobs:
with: with:
path: | path: |
cache.tar.xz cache.tar.xz
key: gam-${{ matrix.jid }}-20240916 key: gam-${{ matrix.jid }}-20240918
- name: Untar Cache archive - name: Untar Cache archive
if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@ -509,8 +509,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)
# git checkout "${latest_release}" git checkout "${latest_release}"
git checkout "v6.9.0" # 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