devops: ensure that embedder directory does not exist (#4340)
Otherwise `cp -r from to` will copy content of `from` to a subdirectory in `to`
This commit is contained in:
parent
65009dc867
commit
283bc2c7d0
|
|
@ -124,12 +124,24 @@ git apply --index --whitespace=nowarn $PATCHES_PATH/*
|
||||||
|
|
||||||
if [[ ! -z "${WEBKIT_EXTRA_FOLDER_PATH}" ]]; then
|
if [[ ! -z "${WEBKIT_EXTRA_FOLDER_PATH}" ]]; then
|
||||||
echo "-- adding WebKit embedders"
|
echo "-- adding WebKit embedders"
|
||||||
cp -r "${WEBKIT_EXTRA_FOLDER_PATH}" ./Tools/Playwright
|
EMBEDDER_DIR="$PWD/Tools/Playwright"
|
||||||
git add Tools/Playwright
|
# git status does not show empty directories, check it separately.
|
||||||
|
if [[ -d $EMBEDDER_DIR ]]; then
|
||||||
|
echo "ERROR: $EMBEDDER_DIR already exists! Remove it and re-run the script."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
cp -r "${WEBKIT_EXTRA_FOLDER_PATH}" $EMBEDDER_DIR
|
||||||
|
git add $EMBEDDER_DIR
|
||||||
elif [[ ! -z "${FIREFOX_EXTRA_FOLDER_PATH}" ]]; then
|
elif [[ ! -z "${FIREFOX_EXTRA_FOLDER_PATH}" ]]; then
|
||||||
echo "-- adding juggler"
|
echo "-- adding juggler"
|
||||||
cp -r "${FIREFOX_EXTRA_FOLDER_PATH}" ./juggler
|
EMBEDDER_DIR="$PWD/juggler"
|
||||||
git add juggler
|
# git status does not show empty directories, check it separately.
|
||||||
|
if [[ -d $EMBEDDER_DIR ]]; then
|
||||||
|
echo "ERROR: $EMBEDDER_DIR already exists! Remove it and re-run the script."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
cp -r "${FIREFOX_EXTRA_FOLDER_PATH}" $EMBEDDER_DIR
|
||||||
|
git add $EMBEDDER_DIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git commit -a --author="playwright-devops <devops@playwright.dev>" -m "chore: bootstrap build #$BUILD_NUMBER"
|
git commit -a --author="playwright-devops <devops@playwright.dev>" -m "chore: bootstrap build #$BUILD_NUMBER"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue