devops: fix Chromium windows archiving logic (#6568)

Turns out MINGW environment doesn't support Python-for-Windows
through shebang. Call python explicitly.
This commit is contained in:
Andrey Lushnikov 2021-05-13 15:10:08 -07:00 committed by GitHub
parent fbae295ce2
commit 654446a757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -58,15 +58,15 @@ function archive_compiled_chromium() {
elif [[ $1 == "--compile-linux" ]]; then elif [[ $1 == "--compile-linux" ]]; then
CHROMIUM_FOLDER_NAME="chrome-linux" CHROMIUM_FOLDER_NAME="chrome-linux"
# Run python script and convert output to array. # Run python script and convert output to array.
IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/linux/FILES.cfg")) IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(python "${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/linux/FILES.cfg"))
unset IFS unset IFS
elif [[ $1 == "--compile-win32" ]]; then elif [[ $1 == "--compile-win32" ]]; then
CHROMIUM_FOLDER_NAME="chrome-win" CHROMIUM_FOLDER_NAME="chrome-win"
IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 32bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg")) IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($(python "${SCRIPT_PATH}/compute_files_to_archive.py" 32bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg"))
unset IFS unset IFS
elif [[ $1 == "--compile-win64" ]]; then elif [[ $1 == "--compile-win64" ]]; then
CHROMIUM_FOLDER_NAME="chrome-win" CHROMIUM_FOLDER_NAME="chrome-win"
IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg")) IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($(python "${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg"))
unset IFS unset IFS
else else
echo "ERROR: unknown command, use --help for details" echo "ERROR: unknown command, use --help for details"