microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-01-05 19:04:43 +03:00
Code Issues Projects Releases Wiki Activity

devops: fix firefox-beta build on Windows 10 (#12477)

Browse Source 
Instead of using 64-bit version of MINGW that comes with Git Bash,
we now switch to the one provided by the mozilla-build on windows,
which is 32-bit.

This patch also reverts the previous attempt that was defining the library names
for redistribution. It should work without them as well.

References #12225
This commit is contained in:
Andrey Lushnikov 2022-03-02 20:30:29 -07:00 committed by GitHub
parent 5db93e6ddf
commit 71a4f69acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser_patches/checkout_build_archive_upload.sh
View File

@ -249,6 +249,8 @@ elif [[ "$BUILD_FLAVOR" == "firefox-beta-win64" ]]; then
EXTRA_BUILD_ARGS="--full"
EXPECTED_HOST_OS="MINGW"
BUILD_BLOB_NAME="firefox-beta-win64.zip"
# This is the architecture that is set by mozilla-build bash.
EXPECTED_ARCH="i686"
# ===========================
# WEBKIT COMPILATION

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

@ -96,8 +96,6 @@ if [[ $1 == "--full" || $2 == "--full" || $1 == "--bootstrap" ]]; then
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
# Having this option in .mozconfig kills incremental compilation.
echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig
echo "export MSVC_C_RUNTIME_DLL=vcruntime140.dll" >> .mozconfig
echo "export MSVC_CXX_RUNTIME_DLL=msvcp140.dll" >> .mozconfig
fi
fi