From 654446a7571e740167bb1fd8b2fb946532de0677 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 13 May 2021 15:10:08 -0700 Subject: [PATCH] devops: fix Chromium windows archiving logic (#6568) Turns out MINGW environment doesn't support Python-for-Windows through shebang. Call python explicitly. --- browser_patches/chromium/archive.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser_patches/chromium/archive.sh b/browser_patches/chromium/archive.sh index 7df0055e6d..1f3fccdaf4 100755 --- a/browser_patches/chromium/archive.sh +++ b/browser_patches/chromium/archive.sh @@ -58,15 +58,15 @@ function archive_compiled_chromium() { elif [[ $1 == "--compile-linux" ]]; then CHROMIUM_FOLDER_NAME="chrome-linux" # 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 elif [[ $1 == "--compile-win32" ]]; then 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 elif [[ $1 == "--compile-win64" ]]; then 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 else echo "ERROR: unknown command, use --help for details"