yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

devops: fix FF build on MacOS (#16023)

Browse Source 
It looks like FF on MacOS requires the `--enable-bootstrap`
flag instead of the original dance with the master branch.
This commit is contained in:
Andrey Lushnikov 2022-07-28 10:49:34 -07:00 committed by GitHub
parent 96574e49eb
commit 792aa6a080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
browser_patches/firefox-beta/build.sh
View File

@ -126,24 +126,28 @@ if [[ -z "${IS_JUGGLER}" ]]; then
fi fi
if [[ -n "${IS_FULL}" ]]; then if [[ -n "${IS_FULL}" ]]; then
# This is a slow but sure way to get all the necessary toolchains. if is_mac; then
# However, it will not work if tree is dirty. echo "ac_add_options --enable-bootstrap" >> .mozconfig
# Bail out if git repo is dirty. else
if [[ -n $(git status -s --untracked-files=no) ]]; then # This is a slow but sure way to get all the necessary toolchains.
echo "ERROR: dirty GIT state - commit everything and re-run the script." # However, it will not work if tree is dirty.
exit 1 # Bail out if git repo is dirty.
if [[ -n $(git status -s --untracked-files=no) ]]; then
echo "ERROR: dirty GIT state - commit everything and re-run the script."
exit 1
fi
# 1. We have a --single-branch checkout, so we have to add a "master" branch and fetch it
git remote set-branches --add browser_upstream master
git fetch browser_upstream master
# 2. Checkout the master branch and run bootstrap from it.
git checkout browser_upstream/master
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
git checkout -
rm -rf "${OBJ_FOLDER}"
fi fi
# 1. We have a --single-branch checkout, so we have to add a "master" branch and fetch it if [[ -n "${WIN32_REDIST_DIR}" ]]; then
git remote set-branches --add browser_upstream master
git fetch browser_upstream master
# 2. Checkout the master branch and run bootstrap from it.
git checkout browser_upstream/master
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
git checkout -
rm -rf "${OBJ_FOLDER}"
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
# Having this option in .mozconfig kills incremental compilation. # Having this option in .mozconfig kills incremental compilation.
echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig
fi fi

36
browser_patches/firefox/build.sh
View File

@ -126,24 +126,28 @@ if [[ -z "${IS_JUGGLER}" ]]; then
fi fi
if [[ -n "${IS_FULL}" ]]; then if [[ -n "${IS_FULL}" ]]; then
# This is a slow but sure way to get all the necessary toolchains. if is_mac; then
# However, it will not work if tree is dirty. echo "ac_add_options --enable-bootstrap" >> .mozconfig
# Bail out if git repo is dirty. else
if [[ -n $(git status -s --untracked-files=no) ]]; then # This is a slow but sure way to get all the necessary toolchains.
echo "ERROR: dirty GIT state - commit everything and re-run the script." # However, it will not work if tree is dirty.
exit 1 # Bail out if git repo is dirty.
if [[ -n $(git status -s --untracked-files=no) ]]; then
echo "ERROR: dirty GIT state - commit everything and re-run the script."
exit 1
fi
# 1. We have a --single-branch checkout, so we have to add a "master" branch and fetch it
git remote set-branches --add browser_upstream master
git fetch browser_upstream master
# 2. Checkout the master branch and run bootstrap from it.
git checkout browser_upstream/master
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
git checkout -
rm -rf "${OBJ_FOLDER}"
fi fi
# 1. We have a --single-branch checkout, so we have to add a "master" branch and fetch it if [[ -n "${WIN32_REDIST_DIR}" ]]; then
git remote set-branches --add browser_upstream master
git fetch browser_upstream master
# 2. Checkout the master branch and run bootstrap from it.
git checkout browser_upstream/master
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
git checkout -
rm -rf "${OBJ_FOLDER}"
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
# Having this option in .mozconfig kills incremental compilation. # Having this option in .mozconfig kills incremental compilation.
echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig
fi fi