From 0dd74e226c75d816d1a513353a1ac5e47513cdf8 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 24 Sep 2024 09:40:47 -0400 Subject: [PATCH] actions: fix wait for signed gam.exe --- .github/workflows/build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 950e41c7..39b8fbc4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -646,18 +646,19 @@ jobs: $gam user gam-win-signer@pdl.jaylee.us add drivefile localfile "$gam" parentid "$folder_id" $gam user gam-win-signer@pdl.jaylee.us update drivefile "$folder_id" newfilename "READYTOSIGN ${folder_number}" export signed_folder="SIGNED ${folder_number}" - export results_file="results-$(date +%s)" + zero_results="gam-win-signer@pdl.jaylee.us,0" while true; do - $gam user gam-win-signer print filelist query "name = '${signed_folder}' and '1Xz3hYq4Mfa_r6D8EcBZHLDtHDFurYSvp' in parents and mimeType = 'application/vnd.google-apps.folder'" id > "$results_file" - export result_lines=$(wc -l < "$results_file") - if [[ "$result_lines" -gt "1" ]]; then - echo "We have signed results." + result_counts=$($gam user gam-win-signer print filelist query "name = '${signed_folder}' and '1Xz3hYq4Mfa_r6D8EcBZHLDtHDFurYSvp' in parents and mimeType = 'application/vnd.google-apps.folder'" countsonly) + echo "$result_counts" + if [[ ! "$result_counts" =~ "$zero_results" ]]; then + echo "looks like we have results" break fi - echo "Sleeping 10 seconds before checking for results again." + echo "no results, sleeping 10..." sleep 10 done - $gam csv "$results_file" gam user gam-win-signer@pdl.jaylee.us print filelist query "'~~id~~' in parents and name = 'gam.exe'" id | $gam csv - gam user gam-win-signer@pdl.jaylee.us get drivefile ~id targetfolder "$gampath" targetfile "gam.exe" overwrite true acknowledgeabuse true + $gam user gam-win-signer print filelist query "name = '${signed_folder}' and '1Xz3hYq4Mfa_r6D8EcBZHLDtHDFurYSvp' in parents and mimeType = 'application/vnd.google-apps.folder'" id | $gam csv - gam user gam-win-signer@pdl.jaylee.us print filelist query "'~~id~~' in parents and name = 'gam.exe'" id | $gam csv - gam user gam-win-signer@pdl.jaylee.us get drivefile ~id targetfolder "$gampath" targetfile "gam.exe" overwrite true acknowledgeabuse true + signtool verify /v "$gam" - name: Attest gam executable was generated from this Action uses: actions/attest-build-provenance@v1