Skip to content

Commit

Permalink
devops: strictly configure build folder for Firefox builds (#1454)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
aslushnikov authored Mar 21, 2020
1 parent c539325 commit 21630d6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
6 changes: 1 addition & 5 deletions browser_patches/firefox/archive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)"
cd checkout

OBJ_FOLDER=$(ls -1 | grep obj-)
if [[ $OBJ_FOLDER == "" ]]; then
echo "ERROR: cannot find obj-* folder in the checkout/. Did you build?"
exit 1;
fi
OBJ_FOLDER="obj-build-playwright"

./mach package
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/firefox
Expand Down
8 changes: 5 additions & 3 deletions browser_patches/firefox/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ else
exit 1;
fi

OBJ_FOLDER="obj-build-playwright"
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig

./mach build

OBJ_FOLDER=$(ls -1 | grep obj-)
if [[ "$(uname)" == "Darwin" ]]; then
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist
node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist
else
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin
node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist/bin
fi

2 changes: 1 addition & 1 deletion browser_patches/firefox/clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)"
cd "checkout"

OBJ_FOLDER=$(ls -1 | grep obj- || true)
OBJ_FOLDER="obj-build-playwright"
if [[ -d $OBJ_FOLDER ]]; then
rm -rf $OBJ_FOLDER
fi
Expand Down

0 comments on commit 21630d6

Please sign in to comment.