Skip to content

Commit 21630d6

Browse files
authored
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.
1 parent c539325 commit 21630d6

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

browser_patches/firefox/archive.sh

+1-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ trap "cd $(pwd -P)" EXIT
3232
cd "$(dirname $0)"
3333
cd checkout
3434

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

4137
./mach package
4238
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/firefox

browser_patches/firefox/build.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ else
3636
exit 1;
3737
fi
3838

39+
OBJ_FOLDER="obj-build-playwright"
40+
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
41+
3942
./mach build
4043

41-
OBJ_FOLDER=$(ls -1 | grep obj-)
4244
if [[ "$(uname)" == "Darwin" ]]; then
43-
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist
45+
node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist
4446
else
45-
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin
47+
node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist/bin
4648
fi
4749

browser_patches/firefox/clean.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
66
cd "$(dirname $0)"
77
cd "checkout"
88

9-
OBJ_FOLDER=$(ls -1 | grep obj- || true)
9+
OBJ_FOLDER="obj-build-playwright"
1010
if [[ -d $OBJ_FOLDER ]]; then
1111
rm -rf $OBJ_FOLDER
1212
fi

0 commit comments

Comments
 (0)