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

chore: fix builds on Apple M1 (#9375)

Browse Source 
Apple M1 builders are now updated to the BigSur 11.6.

This patch:
- changes build assertions to validate 11.6 operating system
- changes build archive name to have major version only
- updates `//src/utils/registry.ts` to a new archive name for M1

This affects only M1 builds for Firefox, Firefox-Beta & WebKit.
We should roll these browsers at least once before 1.16 release.
This commit is contained in:
Andrey Lushnikov 2021-10-07 13:56:08 -07:00 committed by GitHub
parent 51490a82e1
commit 3781faeaaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser_patches/checkout_build_archive_upload.sh
View File

@ -218,13 +218,13 @@ elif [[ "$BUILD_FLAVOR" == "firefox-mac-10.14" ]]; then
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="10.14"
BUILD_BLOB_NAME="firefox-mac-10.14.zip"
elif [[ "$BUILD_FLAVOR" == "firefox-mac-11.0-arm64" ]]; then
elif [[ "$BUILD_FLAVOR" == "firefox-mac-11-arm64" ]]; then
BROWSER_NAME="firefox"
EXTRA_BUILD_ARGS="--full"
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.0"
EXPECTED_HOST_OS_VERSION="11.6"
EXPECTED_ARCH="arm64"
BUILD_BLOB_NAME="firefox-mac-11.0-arm64.zip"
BUILD_BLOB_NAME="firefox-mac-11-arm64.zip"
elif [[ "$BUILD_FLAVOR" == "firefox-win32" ]]; then
BROWSER_NAME="firefox"
EXTRA_BUILD_ARGS="--full"
@ -258,13 +258,13 @@ elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-10.14" ]]; then
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="10.14"
BUILD_BLOB_NAME="firefox-beta-mac-10.14.zip"
elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-11.0-arm64" ]]; then
elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-11-arm64" ]]; then
BROWSER_NAME="firefox-beta"
EXTRA_BUILD_ARGS="--full"
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.0"
EXPECTED_HOST_OS_VERSION="11.6"
EXPECTED_ARCH="arm64"
BUILD_BLOB_NAME="firefox-beta-mac-11.0-arm64.zip"
BUILD_BLOB_NAME="firefox-beta-mac-11-arm64.zip"
elif [[ "$BUILD_FLAVOR" == "firefox-beta-win32" ]]; then
BROWSER_NAME="firefox-beta"
EXTRA_BUILD_ARGS="--full"
@ -300,12 +300,12 @@ elif [[ "$BUILD_FLAVOR" == "webkit-mac-10.15" ]]; then
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="10.15"
BUILD_BLOB_NAME="webkit-mac-10.15.zip"
elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0-arm64" ]]; then
elif [[ "$BUILD_FLAVOR" == "webkit-mac-11-arm64" ]]; then
BROWSER_NAME="webkit"
EXPECTED_HOST_OS="Darwin"
EXPECTED_HOST_OS_VERSION="11.0"
EXPECTED_HOST_OS_VERSION="11.6"
EXPECTED_ARCH="arm64"
BUILD_BLOB_NAME="webkit-mac-11.0-arm64.zip"
BUILD_BLOB_NAME="webkit-mac-11-arm64.zip"
# ===========================

2
browser_patches/firefox-beta/EXPECTED_BUILDS
View File

@ -1,5 +1,5 @@
firefox-beta-mac-10.14.zip
firefox-beta-mac-11.0-arm64.zip
firefox-beta-mac-11-arm64.zip
firefox-beta-ubuntu-18.04.zip
firefox-beta-ubuntu-20.04.zip
firefox-beta-win32.zip

2
browser_patches/firefox/EXPECTED_BUILDS
View File

@ -1,5 +1,5 @@
firefox-mac-10.14.zip
firefox-mac-11.0-arm64.zip
firefox-mac-11-arm64.zip
firefox-ubuntu-18.04.zip
firefox-ubuntu-20.04.zip
firefox-win32.zip

2
browser_patches/webkit/EXPECTED_BUILDS
View File

@ -1,6 +1,6 @@
webkit-ubuntu-18.04.zip
webkit-ubuntu-20.04.zip
webkit-mac-10.15.zip
webkit-mac-11.0-arm64.zip
webkit-mac-11-arm64.zip
webkit-win64.zip

6
src/utils/registry.ts
View File

@ -105,7 +105,7 @@ const DOWNLOAD_URLS = {
'mac10.14': '%s/builds/firefox/%s/firefox-mac-10.14.zip',
'mac10.15': '%s/builds/firefox/%s/firefox-mac-10.14.zip',
'mac11': '%s/builds/firefox/%s/firefox-mac-10.14.zip',
'mac11-arm64': '%s/builds/firefox/%s/firefox-mac-11.0-arm64.zip',
'mac11-arm64': '%s/builds/firefox/%s/firefox-mac-11-arm64.zip',
'win32': '%s/builds/firefox/%s/firefox-win32.zip',
'win64': '%s/builds/firefox/%s/firefox-win64.zip',
},
@ -116,7 +116,7 @@ const DOWNLOAD_URLS = {
'mac10.14': '%s/builds/firefox-beta/%s/firefox-beta-mac-10.14.zip',
'mac10.15': '%s/builds/firefox-beta/%s/firefox-beta-mac-10.14.zip',
'mac11': '%s/builds/firefox-beta/%s/firefox-beta-mac-10.14.zip',
'mac11-arm64': '%s/builds/firefox-beta/%s/firefox-beta-mac-11.0-arm64.zip',
'mac11-arm64': '%s/builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
'win32': '%s/builds/firefox-beta/%s/firefox-beta-win32.zip',
'win64': '%s/builds/firefox-beta/%s/firefox-beta-win64.zip',
},
@ -127,7 +127,7 @@ const DOWNLOAD_URLS = {
'mac10.14': '%s/builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip',
'mac10.15': '%s/builds/webkit/%s/webkit-mac-10.15.zip',
'mac11': '%s/builds/webkit/%s/webkit-mac-10.15.zip',
'mac11-arm64': '%s/builds/webkit/%s/webkit-mac-11.0-arm64.zip',
'mac11-arm64': '%s/builds/webkit/%s/webkit-mac-11-arm64.zip',
'win32': '%s/builds/webkit/%s/webkit-win64.zip',
'win64': '%s/builds/webkit/%s/webkit-win64.zip',
},