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

devops: default chromium checkout to $HOME/chromium (#9859)

Browse source 
This defaults Chromium checkout to $HOME/chromium unless a
`CR_CHROMIUM_CHECKOUT` is specified.
This commit is contained in:
Andrey Lushnikov 2021-10-28 11:48:57 -07:00 committed by GitHub
parent dbabda61fd
commit 544dcd8804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
browser_patches/chromium/archive.sh
View file

@ -49,6 +49,14 @@ main() {
} }
function archive_compiled_chromium() { function archive_compiled_chromium() {
if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
CR_CHECKOUT_PATH="$HOME/chromium"
fi
if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?"
exit 1
fi
CHROMIUM_FOLDER_NAME="" CHROMIUM_FOLDER_NAME=""
CHROMIUM_FILES_TO_ARCHIVE=() CHROMIUM_FILES_TO_ARCHIVE=()

5
browser_patches/chromium/build.sh
View file

@ -32,11 +32,10 @@ main() {
compile_chromium() { compile_chromium() {
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." CR_CHECKOUT_PATH="$HOME/chromium"
exit 1
fi fi
if [[ -z "${CR_CHECKOUT_PATH}/src" ]]; then if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?" echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?"
exit 1 exit 1
fi fi

7
browser_patches/chromium/clean.sh
View file

@ -6,7 +6,12 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname "$0")" cd "$(dirname "$0")"
rm -rf output rm -rf output
if [[ ! -z "${CR_CHECKOUT_PATH}" ]]; then if [[ -z "${CR_CHECKOUT_PATH}" ]]; then
CR_CHECKOUT_PATH="$HOME/chromium"
fi
if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
rm -rf "${CR_CHECKOUT_PATH}/src/out" rm -rf "${CR_CHECKOUT_PATH}/src/out"
fi fi

11
browser_patches/prepare_checkout.sh
View file

@ -33,9 +33,7 @@ function prepare_chromium_checkout {
source "${SCRIPT_PATH}/chromium/ensure_depot_tools.sh" 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." CR_CHECKOUT_PATH="$HOME/chromium"
echo "NOTE: we expect '\$CR_CHECKOUT_PATH/src' to exist to be a valid chromium checkout."
exit 1
fi fi
# Get chromium SHA from the build revision. # Get chromium SHA from the build revision.
@ -47,7 +45,7 @@ function prepare_chromium_checkout {
# Update Chromium checkout. # Update Chromium checkout.
# #
# This is based on https://chromium.googlesource.com/chromium/src/+/master/docs/linux/build_instructions.md#get-the-code # This is based on https://chromium.googlesource.com/chromium/src/+/master/docs/linux/build_instructions.md#get-the-code
if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then if [[ ! -d "${CR_CHECKOUT_PATH}" ]]; then
rm -rf "${CR_CHECKOUT_PATH}" rm -rf "${CR_CHECKOUT_PATH}"
mkdir -p "${CR_CHECKOUT_PATH}" mkdir -p "${CR_CHECKOUT_PATH}"
cd "${CR_CHECKOUT_PATH}" cd "${CR_CHECKOUT_PATH}"
@ -58,6 +56,11 @@ function prepare_chromium_checkout {
fi fi
gclient runhooks gclient runhooks
fi fi
if [[ ! -d "${CR_CHECKOUT_PATH}/src" ]]; then
echo "ERROR: CR_CHECKOUT_PATH does not have src/ subfolder; is this a chromium checkout?"
exit 1
fi
cd "${CR_CHECKOUT_PATH}/src" cd "${CR_CHECKOUT_PATH}/src"
git checkout master git checkout master
git pull origin master git pull origin master