Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix chromium build script (#7669)

Browse source
This commit is contained in:
Andrey Lushnikov 2021-07-16 01:36:49 -08:00 committed by GitHub
parent 8b2dd2e3d1
commit 64ef88999e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
browser_patches/chromium/build.sh
View file

@ -12,7 +12,7 @@ USAGE=$(cat<<EOF
EOF EOF
) )
SCRIPT_PATH=$(pwd -P) SCRIPT_FOLDER=$(pwd -P)
source "${SCRIPT_FOLDER}/../utils.sh" source "${SCRIPT_FOLDER}/../utils.sh"
main() { main() {
@ -41,7 +41,7 @@ compile_chromium() {
exit 1 exit 1
fi fi
source "${SCRIPT_PATH}/ensure_depot_tools.sh" source "${SCRIPT_FOLDER}/ensure_depot_tools.sh"
if [[ $1 == "--compile-mac"* ]]; then if [[ $1 == "--compile-mac"* ]]; then
# As of Jan, 2021 Chromium mac compilation requires Xcode12.2 # As of Jan, 2021 Chromium mac compilation requires Xcode12.2
@ -72,7 +72,7 @@ compile_chromium() {
fi fi
if [[ ! -z "$USE_GOMA" ]]; then if [[ ! -z "$USE_GOMA" ]]; then
PLAYWRIGHT_GOMA_PATH="${SCRIPT_PATH}/electron-build-tools/third_party/goma" PLAYWRIGHT_GOMA_PATH="${SCRIPT_FOLDER}/electron-build-tools/third_party/goma"
if [[ $1 == "--compile-win"* ]]; then if [[ $1 == "--compile-win"* ]]; then
PLAYWRIGHT_GOMA_PATH=$(cygpath -w "${PLAYWRIGHT_GOMA_PATH}") PLAYWRIGHT_GOMA_PATH=$(cygpath -w "${PLAYWRIGHT_GOMA_PATH}")
fi fi
@ -82,9 +82,9 @@ compile_chromium() {
if [[ $1 == "--compile-win"* ]]; then if [[ $1 == "--compile-win"* ]]; then
if [[ -z "$USE_GOMA" ]]; then if [[ -z "$USE_GOMA" ]]; then
/c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_PATH}/buildwin.bat)" /c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_FOLDER}/buildwin.bat)"
else else
/c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_PATH}/buildwingoma.bat)" /c/Windows/System32/cmd.exe "/c $(cygpath -w ${SCRIPT_FOLDER}/buildwingoma.bat)"
fi fi
else else
gn gen out/Default gn gen out/Default
@ -102,7 +102,7 @@ compile_chromium() {
} }
mirror_chromium() { mirror_chromium() {
cd "$SCRIPT_PATH" cd "$SCRIPT_FOLDER"
rm -rf output rm -rf output
mkdir -p output mkdir -p output
cd output cd output
@ -124,7 +124,7 @@ mirror_chromium() {
fi fi
fi fi
CRREV=$(head -1 "${SCRIPT_PATH}/BUILD_NUMBER") CRREV=$(head -1 "${SCRIPT_FOLDER}/BUILD_NUMBER")
if [[ "${PLATFORM}" == "--mirror-win32" ]]; then if [[ "${PLATFORM}" == "--mirror-win32" ]]; then
CHROMIUM_URL="https://storage.googleapis.com/chromium-browser-snapshots/Win/${CRREV}/chrome-win.zip" CHROMIUM_URL="https://storage.googleapis.com/chromium-browser-snapshots/Win/${CRREV}/chrome-win.zip"
elif [[ "${PLATFORM}" == "--mirror-win64" ]]; then elif [[ "${PLATFORM}" == "--mirror-win64" ]]; then