Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: enforce hard xcode version match for browser builds (#7591)

Browse source 
Browsers require particular xcode versions to be installed on the host
machine to produce successful build.

This patch starts using explicit xcode versions for all mac browser
builds.
This commit is contained in:
Andrey Lushnikov 2021-07-13 17:12:53 -08:00 committed by GitHub
parent 77afd6bdad
commit 34777853f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 80 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
browser_patches/chromium/build.sh
View file

@ -13,6 +13,7 @@ EOF
) )
SCRIPT_PATH=$(pwd -P) SCRIPT_PATH=$(pwd -P)
source "${SCRIPT_FOLDER}/../utils.sh"
main() { main() {
if [[ $1 == "--help" || $1 == "-h" ]]; then if [[ $1 == "--help" || $1 == "-h" ]]; then
@ -44,12 +45,7 @@ compile_chromium() {
if [[ $1 == "--compile-mac"* ]]; then if [[ $1 == "--compile-mac"* ]]; then
# As of Jan, 2021 Chromium mac compilation requires Xcode12.2 # As of Jan, 2021 Chromium mac compilation requires Xcode12.2
if [[ ! -d /Applications/Xcode12.2.app ]]; then selectXcodeVersionOrDie "12.2"
echo "ERROR: chromium mac compilation requires /Applications/Xcode12.2.app"
echo "Download one from https://developer.apple.com/download/more/"
exit 1
fi
export DEVELOPER_DIR=/Applications/Xcode12.2.app/Contents/Developer
# As of Jan, 2021 Chromium mac compilation is only possible on Intel macbooks. # As of Jan, 2021 Chromium mac compilation is only possible on Intel macbooks.
# See https://chromium.googlesource.com/chromium/src.git/+/master/docs/mac_arm64.md # See https://chromium.googlesource.com/chromium/src.git/+/master/docs/mac_arm64.md
if [[ $1 == "--compile-mac-arm64" && $(uname -m) != "x86_64" ]]; then if [[ $1 == "--compile-mac-arm64" && $(uname -m) != "x86_64" ]]; then

4
browser_patches/firefox-beta/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1269 1270
Changed: max@schmitt.mx Tue Jul 13 16:28:05 UTC 2021 Changed: aslushnikov@gmail.com Tue Jul 13 16:28:05 UTC 2021

25
browser_patches/firefox-beta/build.sh
View file

@ -13,6 +13,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
SCRIPT_FOLDER="$(pwd -P)" SCRIPT_FOLDER="$(pwd -P)"
source "${SCRIPT_FOLDER}/../utils.sh"
if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
cd "${FF_CHECKOUT_PATH}" cd "${FF_CHECKOUT_PATH}"
@ -24,21 +25,21 @@ fi
rm -rf .mozconfig rm -rf .mozconfig
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
if [[ $(uname -m) == "arm64" ]]; then CURRENT_HOST_OS_VERSION=$(getMacVersion)
# Building on Apple Silicon requires XCode12.2 and does not require any extra SDKs. if [[ "${CURRENT_HOST_OS_VERSION}" == "10.14" ]]; then
if ! [[ -d "/Applications/Xcode12.2.app" ]]; then selectXcodeVersionOrDie "11.3.1"
echo "As of Jan 2021, building Firefox on Apple Silicon requires XCode 12.2" elif [[ "${CURRENT_HOST_OS_VERSION}" == "11."* ]]; then
echo "Make sure there's an /Applications/Xcode12.2.app" # As of Jan 2021, building Firefox on Apple Silicon requires XCode 12.2
echo "Download XCode from https://developer.apple.com/download/more/" selectXcodeVersionOrDie "12.2"
echo ""
exit 1
fi
export DEVELOPER_DIR=/Applications/Xcode12.2.app/Contents/Developer
else else
# Firefox currently does not build on 10.15 out of the box - it requires SDK for 10.12. echo "ERROR: ${CURRENT_HOST_OS_VERSION} is not supported"
exit 1
fi
if [[ "${CURRENT_HOST_OS_VERSION}" == "10."* ]]; then
# Firefox currently does not build on 10.14 or 10.15 out of the box - it requires SDK for 10.12.
# Make sure the SDK is out there. # Make sure the SDK is out there.
if ! [[ -d $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk ]]; then if ! [[ -d $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk ]]; then
echo "As of Dec 2020, Firefox does not build on Mac without ${MACOS_SDK_VERSION} SDK." echo "As of Dec 2020, Firefox does not build on Mac ${CURRENT_HOST_OS_VERSION} without ${MACOS_SDK_VERSION} SDK."
echo "Download XCode ${XCODE_VERSION_WITH_REQUIRED_SDK_VERSION} from https://developer.apple.com/download/more/ and" echo "Download XCode ${XCODE_VERSION_WITH_REQUIRED_SDK_VERSION} from https://developer.apple.com/download/more/ and"
echo "extract SDK to $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk" echo "extract SDK to $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk"
echo "" echo ""

4
browser_patches/firefox/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1276 1277
Changed: max@schmitt.mx Tue Jul 13 13:50:07 UTC 2021 Changed: aslushnikov@gmail.com Tue Jul 13 16:28:05 UTC 2021

25
browser_patches/firefox/build.sh
View file

@ -13,6 +13,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
SCRIPT_FOLDER="$(pwd -P)" SCRIPT_FOLDER="$(pwd -P)"
source "${SCRIPT_FOLDER}/../utils.sh"
if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
cd "${FF_CHECKOUT_PATH}" cd "${FF_CHECKOUT_PATH}"
@ -24,21 +25,21 @@ fi
rm -rf .mozconfig rm -rf .mozconfig
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
if [[ $(uname -m) == "arm64" ]]; then CURRENT_HOST_OS_VERSION=$(getMacVersion)
# Building on Apple Silicon requires XCode12.2 and does not require any extra SDKs. if [[ "${CURRENT_HOST_OS_VERSION}" == "10.14" ]]; then
if ! [[ -d "/Applications/Xcode12.2.app" ]]; then selectXcodeVersionOrDie "11.3.1"
echo "As of Jan 2021, building Firefox on Apple Silicon requires XCode 12.2" elif [[ "${CURRENT_HOST_OS_VERSION}" == "11."* ]]; then
echo "Make sure there's an /Applications/Xcode12.2.app" # As of Jan 2021, building Firefox on Apple Silicon requires XCode 12.2
echo "Download XCode from https://developer.apple.com/download/more/" selectXcodeVersionOrDie "12.2"
echo ""
exit 1
fi
export DEVELOPER_DIR=/Applications/Xcode12.2.app/Contents/Developer
else else
# Firefox currently does not build on 10.15 out of the box - it requires SDK for 10.12. echo "ERROR: ${CURRENT_HOST_OS_VERSION} is not supported"
exit 1
fi
if [[ "${CURRENT_HOST_OS_VERSION}" == "10."* ]]; then
# Firefox currently does not build on 10.14 or 10.15 out of the box - it requires SDK for 10.12.
# Make sure the SDK is out there. # Make sure the SDK is out there.
if ! [[ -d $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk ]]; then if ! [[ -d $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk ]]; then
echo "As of Dec 2020, Firefox does not build on Mac without ${MACOS_SDK_VERSION} SDK." echo "As of Dec 2020, Firefox does not build on Mac ${CURRENT_HOST_OS_VERSION} without ${MACOS_SDK_VERSION} SDK."
echo "Download XCode ${XCODE_VERSION_WITH_REQUIRED_SDK_VERSION} from https://developer.apple.com/download/more/ and" echo "Download XCode ${XCODE_VERSION_WITH_REQUIRED_SDK_VERSION} from https://developer.apple.com/download/more/ and"
echo "extract SDK to $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk" echo "extract SDK to $HOME/SDK-archive/MacOSX${MACOS_SDK_VERSION}.sdk"
echo "" echo ""

33
browser_patches/utils.sh Normal file
View file

@ -0,0 +1,33 @@
#!/bin/bash
function getMacVersion() {
sw_vers -productVersion | grep -o '^\d\+.\d\+'
}
function selectXcodeVersionOrDie() {
XCODE_VERSION="$1"
if [[ -z "${XCODE_VERSION}" ]]; then
echo "selectXcodeOrDie expects xcode vesion to be given!"
exit 1
fi
XCODE_DIRECTORY="/Applications/Xcode${XCODE_VERSION}.app"
if ! [[ -d "${XCODE_DIRECTORY}" ]]; then
echo "ERROR: Xcode ${XCODE_VERSION} is required to compile!"
echo
echo "Either:"
echo
echo "- download required Xcode version from the developer.apple.com/downloads"
echo " once downloaded, make sure to run the following:"
echo
echo " $ cd ${XCODE_DIRECTORY}/Contents/Resources/Packages"
echo " $ sudo installer -pkg XcodeSystemResources.pkg -target /"
echo
echo "- if you have some Xcode installation and want to try building with it:"
echo
echo " $ ln -s /Applications/Xcode.app ${XCODE_DIRECTORY}"
exit 1
fi
# This line sets XCode for all nested bash processes.
export DEVELOPER_DIR="${XCODE_DIRECTORY}/Contents/Developer"
echo "-- using ${XCODE_DIRECTORY}"
}

4
browser_patches/webkit/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1511 1512
Changed: pavel.feldman@gmail.com Wed Jul 14 03:36:24 MSK 2021 Changed: aslushnikov@gmail.com Tue Jul 13 17:11:05 UTC 2021

10
browser_patches/webkit/build.sh
View file

@ -5,6 +5,7 @@ set +x
trap "cd $(pwd -P)" EXIT trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)" cd "$(dirname $0)"
SCRIPT_FOLDER="$(pwd -P)" SCRIPT_FOLDER="$(pwd -P)"
source "${SCRIPT_FOLDER}/../utils.sh"
build_gtk() { build_gtk() {
if ! [[ -d ./WebKitBuild/GTK/DependenciesGTK ]]; then if ! [[ -d ./WebKitBuild/GTK/DependenciesGTK ]]; then
@ -43,6 +44,15 @@ else
fi fi
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
CURRENT_HOST_OS_VERSION=$(getMacVersion)
if [[ "${CURRENT_HOST_OS_VERSION}" == "10.15" ]]; then
selectXcodeVersionOrDie "11.7"
elif [[ "${CURRENT_HOST_OS_VERSION}" == "11."* ]]; then
selectXcodeVersionOrDie "12.2"
else
echo "ERROR: ${CURRENT_HOST_OS_VERSION} is not supported"
exit 1
fi
./Tools/Scripts/build-webkit --release --touch-events --orientation-events ./Tools/Scripts/build-webkit --release --touch-events --orientation-events
elif [[ "$(uname)" == "Linux" ]]; then elif [[ "$(uname)" == "Linux" ]]; then
if [[ $# == 0 || (-z "$1") ]]; then if [[ $# == 0 || (-z "$1") ]]; then

4
browser_patches/webkit/pw_run.sh
View file

@ -2,7 +2,9 @@
function runOSX() { function runOSX() {
# if script is run as-is # if script is run as-is
if [[ -d $SCRIPT_PATH/checkout/WebKitBuild/Release/Playwright.app ]]; then if [[ -f "${SCRIPT_PATH}/EXPECTED_BUILDS" && -n "$WK_CHECKOUT_PATH" -d "$WK_CHECKOUT_PATH/WebKitBuild/Release/Playwright.app" ]]; then
DYLIB_PATH="$WK_CHECKOUT_PATH/WebKitBuild/Release"
elif [[ -f "${SCRIPT_PATH}/EXPECTED_BUILDS" && -d $SCRIPT_PATH/checkout/WebKitBuild/Release/Playwright.app ]]; then
DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Release" DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Release"
elif [[ -d $SCRIPT_PATH/Playwright.app ]]; then elif [[ -d $SCRIPT_PATH/Playwright.app ]]; then
DYLIB_PATH="$SCRIPT_PATH" DYLIB_PATH="$SCRIPT_PATH"