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

actions: attempt arm MSI again

Browse Source
This commit is contained in:
Jay Lee 2025-04-22 11:10:09 -04:00 committed by GitHub
parent f60750a647
commit 164b999802
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,18 +252,15 @@ jobs:
PERL="c:\strawberry\perl\bin\perl.exe" PERL="c:\strawberry\perl\bin\perl.exe"
if [[ "$RUNNER_ARCH" == "ARM64" ]]; then if [[ "$RUNNER_ARCH" == "ARM64" ]]; then
PYEXTERNALS_PATH="arm64" PYEXTERNALS_PATH="arm64"
GAM_ARCHIVE_ARCH="arm64"
WIX_ARCH="arm64" WIX_ARCH="arm64"
CHOC_OPS="" CHOC_OPS=""
elif [[ "$RUNNER_ARCH" == "X64" ]]; then elif [[ "$RUNNER_ARCH" == "X64" ]]; then
PYEXTERNALS_PATH="amd64" PYEXTERNALS_PATH="amd64"
GAM_ARCHIVE_ARCH="x86_64"
WIX_ARCH="x64" WIX_ARCH="x64"
CHOC_OPS="" CHOC_OPS=""
fi fi
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}"
echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV
echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV
echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV
fi fi
echo "We'll run make with: ${MAKEOPT}" echo "We'll run make with: ${MAKEOPT}"
@ -662,33 +659,35 @@ jobs:
run: | run: |
choco install wixtoolset choco install wixtoolset
- name: Windows package - name: Windows package zip
if: runner.os == 'Windows' && matrix.goal != 'test' if: runner.os == 'Windows' && matrix.goal != 'test'
run: | run: |
echo "started in $(pwd)" echo "started in $(pwd)"
cd "${gampath}/.." cd "${gampath}/.."
echo "moved to $(pwd)" echo "moved to $(pwd)"
GAM_ARCHIVE="${GITHUB_WORKSPACE}/gam-${GAMVERSION}-windows-${GAM_ARCHIVE_ARCH}.zip" GAM_ARCHIVE="${GITHUB_WORKSPACE}/gam-${GAMVERSION}-windows-${arch}.zip"
/c/Program\ Files/7-Zip/7z.exe a -tzip "$GAM_ARCHIVE" gam7 "-xr@${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" -bb3 /c/Program\ Files/7-Zip/7z.exe a -tzip "$GAM_ARCHIVE" gam7 "-xr@${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" -bb3
if [ "$RUNNER_ARCH" == "X64" ]; then
cd ../.. - name: Windows package MSI
echo "moved to $(pwd)" if: runner.os == "Windows" && matrix.goal != 'test'
export MSI_FILENAME="${GITHUB_WORKSPACE}/gam-${GAMVERSION}-windows-${GAM_ARCHIVE_ARCH}.msi" run: |
# auto-generate a lib.wxs based on the files PyInstaller created for the lib/ directory cd ../..
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/heat.exe dir "${gampath}/lib" -ke -srd -cg Lib -gg -dr lib -directoryid lib -out lib.wxs echo "moved to $(pwd)"
$PYTHON tools/gen-wix-xml-filelist.py lib.wxs export MSI_FILENAME="${GITHUB_WORKSPACE}/gam-${GAMVERSION}-windows-${arch}.msi"
echo "-- begin lib.wxs --" # auto-generate a lib.wxs based on the files PyInstaller created for the lib/ directory
cat lib.wxs /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/heat.exe dir "${gampath}/lib" -ke -srd -cg Lib -gg -dr lib -directoryid lib -out lib.wxs
echo "-- end lib.wxs --" $PYTHON tools/gen-wix-xml-filelist.py lib.wxs
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/candle.exe -arch "${WIX_ARCH}" gam.wxs lib.wxs echo "-- begin lib.wxs --"
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/WixUIExtension.dll gam.wixobj lib.wixobj -b "${gampath}/lib" -o "$MSI_FILENAME" || true; cat lib.wxs
rm -v -f *.wixpdb echo "-- end lib.wxs --"
rm -v -f *.wixobj /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/candle.exe -arch "${WIX_ARCH}" gam.wxs lib.wxs
echo "MSI_FILENAME=${MSI_FILENAME}" >> $GITHUB_ENV /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/WixUIExtension.dll gam.wixobj lib.wixobj -b "${gampath}/lib" -o "$MSI_FILENAME" || true;
fi rm -v -f *.wixpdb
rm -v -f *.wixobj
echo "MSI_FILENAME=${MSI_FILENAME}" >> $GITHUB_ENV
- name: Upload gam MSI Windows for signing - name: Upload gam MSI Windows for signing
if: runner.os == 'Windows' && runner.arch == 'X64' && matrix.goal != 'test' if: runner.os == 'Windows' && matrix.goal != 'test'
run: | run: |
export folder_number=$(date +%s) export folder_number=$(date +%s)
export folder_id=$($gam user gam-win-signer@pdl.jaylee.us add drivefile drivefilename "UPLOADING_FOR_SIGN ${folder_number}" parentid "1Xz3hYq4Mfa_r6D8EcBZHLDtHDFurYSvp" mimetype gfolder returnidonly) export folder_id=$($gam user gam-win-signer@pdl.jaylee.us add drivefile drivefilename "UPLOADING_FOR_SIGN ${folder_number}" parentid "1Xz3hYq4Mfa_r6D8EcBZHLDtHDFurYSvp" mimetype gfolder returnidonly)