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

devops: fix prepare_checkout with custom checkout path

Browse source
This commit is contained in:
Andrey Lushnikov 2019-11-23 16:22:04 -08:00
parent efa5a559ef
commit 2914f9a1f1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
browser_patches/prepare_checkout.sh
View file

@ -29,13 +29,16 @@ fi
# FRIENDLY_CHECKOUT_PATH is used only for logging. # FRIENDLY_CHECKOUT_PATH is used only for logging.
FRIENDLY_CHECKOUT_PATH=""; FRIENDLY_CHECKOUT_PATH="";
CHECKOUT_PATH="" CHECKOUT_PATH=""
PATCHES_PATH=""
if [[ ("$1" == "firefox") || ("$1" == "firefox/") ]]; then if [[ ("$1" == "firefox") || ("$1" == "firefox/") ]]; then
FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout"; FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
CHECKOUT_PATH="$PWD/firefox/checkout" CHECKOUT_PATH="$PWD/firefox/checkout"
PATCHES_PATH="$PWD/firefox/patches"
source "./firefox/UPSTREAM_CONFIG.sh" source "./firefox/UPSTREAM_CONFIG.sh"
elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then
FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout"; FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout";
CHECKOUT_PATH="$PWD/webkit/checkout" CHECKOUT_PATH="$PWD/webkit/checkout"
PATCHES_PATH="$PWD/webkit/patches"
source "./webkit/UPSTREAM_CONFIG.sh" source "./webkit/UPSTREAM_CONFIG.sh"
else else
echo ERROR: unknown browser - "$1" echo ERROR: unknown browser - "$1"
@ -101,7 +104,7 @@ if git show-ref --verify --quiet refs/heads/playwright-build; then
fi fi
git checkout -b playwright-build git checkout -b playwright-build
echo "-- applying all patches" echo "-- applying all patches"
git am ../patches/* git am $PATCHES_PATH/*
echo echo
echo echo