From ccaa76026cf8c93094d4751f311d2a0a63b89b54 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 2 Oct 2024 11:33:50 -0400 Subject: [PATCH] actions: fix MSI location, remove dupe upload for signing --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff8d821a..264968fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -694,7 +694,7 @@ jobs: /c/Program\ Files/7-Zip/7z.exe a -tzip "$GAM_ARCHIVE" gam7 "-xr@${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" -bb3 cd ../.. echo "moved to $(pwd)" - export MSI_FILENAME="${GITHUB_WORKSPACE}/src/gam-${GAMVERSION}-windows-${GAM_ARCHIVE_ARCH}.msi" + export MSI_FILENAME="${GITHUB_WORKSPACE}/gam-${GAMVERSION}-windows-${GAM_ARCHIVE_ARCH}.msi" # auto-generate a lib.wxs based on the files PyInstaller created for the lib/ directory /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 "-- begin lib.wxs --" @@ -704,10 +704,6 @@ jobs: /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; rm -v -f *.wixpdb rm -v -f *.wixobj - 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) - $gam user gam-win-signer@pdl.jaylee.us add drivefile localfile "$MSI_FILENAME" parentid "$folder_id" - $gam user gam-win-signer@pdl.jaylee.us update drivefile "$folder_id" newfilename "READYTOSIGN ${folder_number}" echo "MSI_FILENAME=${MSI_FILENAME}" >> $GITHUB_ENV - name: Upload gam MSI Windows for signing