yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

devops(chromium): missing depot tools in prepare_checkout.sh script (#5525)

Browse Source 
Make sure `prepare_checkout.sh` has depot_tools in its PATH.

Drive-by: enable goma compiler proxy auto-restart.
This commit is contained in:
Andrey Lushnikov 2021-02-19 14:23:09 -08:00 committed by GitHub
parent 57c7a703ca
commit c57f1fc390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser_patches/chromium/build.sh
View File

@ -13,7 +13,6 @@ EOF
) )
SCRIPT_PATH=$(pwd -P) SCRIPT_PATH=$(pwd -P)
CRREV=$(head -1 ./BUILD_NUMBER)
main() { main() {
if [[ $1 == "--help" || $1 == "-h" ]]; then if [[ $1 == "--help" || $1 == "-h" ]]; then
@ -41,15 +40,7 @@ compile_chromium() {
exit 1 exit 1
fi fi
# install depot_tools if they are not in system source "${SCRIPT_PATH}/ensure_depot_tools.sh"
# NOTE: as of Feb 8, 2021, windows requires manual and separate
# installation of depot_tools.
if ! command -v autoninja >/dev/null; then
if [[ ! -d "${SCRIPT_PATH}/depot_tools" ]]; then
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "${SCRIPT_PATH}/depot_tools"
fi
export PATH="${SCRIPT_PATH}/depot_tools:$PATH"
fi
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
@ -135,6 +126,7 @@ mirror_chromium() {
fi fi
fi fi
CRREV=$(head -1 "${SCRIPT_PATH}/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

28
browser_patches/chromium/ensure_depot_tools.sh Normal file
View File

@ -0,0 +1,28 @@
# Since this script modifies PATH, it cannot be run in a subshell
# and must be sourced.
# Make sure it is sourced.
sourced=0
(return 0 2>/dev/null) && sourced=1 || sourced=0
if [[ $sourced == 0 ]]; then
echo 'ERROR: cannot run this script in a subshell'
echo 'This file modifies $PATH of the current shell, so it must be sourced instead'
echo 'Use `source ensure_depot_tool.sh` instead'
exit 1
fi
# Install depot_tools if they are not in system, and modify $PATH
# to include depot_tools
if ! command -v autoninja >/dev/null; then
if [[ $(uname) == "MINGW"* ]]; then
# NOTE: as of Feb 8, 2021, windows requires manual and separate
# installation of depot_tools.
echo "ERROR: cannot automatically install depot_tools on windows. Please, install manually"
exit 1
fi
SCRIPT_PATH=$(cd "$(dirname "$BASH_SOURCE")"; pwd -P)
if [[ ! -d "${SCRIPT_PATH}/depot_tools" ]]; then
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "${SCRIPT_PATH}/depot_tools"
fi
export PATH="${SCRIPT_PATH}/depot_tools:$PATH"
fi

2
browser_patches/chromium/goma.sh
View File

@ -16,6 +16,8 @@ fi
cd electron-build-tools/third_party/goma cd electron-build-tools/third_party/goma
export GOMA_START_COMPILER_PROXY=true
if [[ $1 == "--help" ]]; then if [[ $1 == "--help" ]]; then
echo "$(basename $0) [login|start|stop|--help]" echo "$(basename $0) [login|start|stop|--help]"
exit 0 exit 0

3
browser_patches/prepare_checkout.sh
View File

@ -29,6 +29,9 @@ fi
function prepare_chromium_checkout { function prepare_chromium_checkout {
cd "${SCRIPT_PATH}" cd "${SCRIPT_PATH}"
source "${SCRIPT_PATH}/chromium/ensure_depot_tools.sh"
if [[ -z "${CR_CHECKOUT_PATH}" ]]; then if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
echo "ERROR: chromium compilation requires CR_CHECKOUT_PATH to be set to reuse checkout." echo "ERROR: chromium compilation requires CR_CHECKOUT_PATH to be set to reuse checkout."
echo "NOTE: we expect '\$CR_CHECKOUT_PATH/src' to exist to be a valid chromium checkout." echo "NOTE: we expect '\$CR_CHECKOUT_PATH/src' to exist to be a valid chromium checkout."