devops: fix archiving of Chromium Linux Arm64 build (#9980)

This commit is contained in:
Andrey Lushnikov 2021-11-02 10:36:51 -07:00 коммит произвёл GitHub
Родитель 64a2be0e43
Коммит d9d41b2e01
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 14 добавлений и 2 удалений

Просмотреть файл

@ -64,10 +64,14 @@ function archive_compiled_chromium() {
CHROMIUM_FOLDER_NAME="chrome-mac"
IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/mac-archive-rel.json"))
unset IFS
elif [[ $1 == "--compile-linux"* ]]; then
elif [[ $1 == "--compile-linux" ]]; then
CHROMIUM_FOLDER_NAME="chrome-linux"
IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/linux-archive-rel.json"))
unset IFS
elif [[ $1 == "--compile-linux-arm64" ]]; then
CHROMIUM_FOLDER_NAME="chrome-linux"
IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/linux-archive-rel.json" --linux-arm64))
unset IFS
elif [[ $1 == "--compile-win64" ]]; then
CHROMIUM_FOLDER_NAME="chrome-win"
IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($(node "${SCRIPT_PATH}/compute_files_to_archive.js" "${CR_CHECKOUT_PATH}/src/infra/archive_config/win-archive-rel.json"))

Просмотреть файл

@ -13,10 +13,18 @@ const excludeList = new Set([
'interactive_ui_tests.exe',
]);
// There is no upstream configuration for packaging Linux Arm64 builds,
// so we build one by replacing x86_64-specific nacl binary with arm one.
const replaceMap = {
'--linux-arm64': {
'nacl_irt_x86_64.nexe': 'nacl_irt_arm.nexe',
},
}[process.argv[3]] || {};
const entries = [
...(config.files || []),
...(config.dirs || []),
].filter(entry => !excludeList.has(entry));
].filter(entry => !excludeList.has(entry)).map(entry => replaceMap[entry] || entry);
for (const entry of entries)
console.log(entry);