root
/
playwright
mirror of https://github.com/microsoft/playwright.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

devops: strictly configure build folder for Firefox builds (#1454) 

This strictly defines Firefox build folder as `obj-build-playwright`.

Currently, Firefox build folder encodes current Mac OS version including
patch versions, and thus we might end up with multiple different build
folders.
This commit is contained in:
Andrey Lushnikov 2020-03-20 19:24:38 -07:00 committed by GitHub
parent c539325615
commit 21630d6de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser_patches/firefox/archive.sh
View File

@ -32,11 +32,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
cd checkout cd checkout
OBJ_FOLDER=$(ls -1 | grep obj-) OBJ_FOLDER="obj-build-playwright"
if [[ $OBJ_FOLDER == "" ]]; then
echo "ERROR: cannot find obj-* folder in the checkout/. Did you build?"
exit 1;
fi
./mach package ./mach package
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/firefox node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/firefox

8
browser_patches/firefox/build.sh
View File

@ -36,12 +36,14 @@ else
exit 1; exit 1;
fi fi
OBJ_FOLDER="obj-build-playwright"
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
./mach build ./mach build
OBJ_FOLDER=$(ls -1 | grep obj-)
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist
else else
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist/bin
fi fi

2
browser_patches/firefox/clean.sh
View File

@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
cd "checkout" cd "checkout"
OBJ_FOLDER=$(ls -1 | grep obj- || true) OBJ_FOLDER="obj-build-playwright"
if [[ -d $OBJ_FOLDER ]]; then if [[ -d $OBJ_FOLDER ]]; then
rm -rf $OBJ_FOLDER rm -rf $OBJ_FOLDER
fi fi