diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index 108654575b..04c581c3d5 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -21,6 +21,7 @@ if [[ $# == 0 ]]; then exit 1 fi +CURRENT_ARCH="$(uname -m)" CURRENT_HOST_OS="$(uname)" CURRENT_HOST_OS_VERSION="" if [[ "$CURRENT_HOST_OS" == "Darwin" ]]; then @@ -36,6 +37,7 @@ BUILD_FLAVOR="$1" BUILD_BLOB_NAME="" EXPECTED_HOST_OS="" EXPECTED_HOST_OS_VERSION="" +EXPECTED_ARCH="x86_64" if [[ "$BUILD_FLAVOR" == "winldd-win64" ]]; then BROWSER_NAME="winldd" EXPECTED_HOST_OS="MINGW" @@ -138,11 +140,24 @@ elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0" ]]; then EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="11.0" BUILD_BLOB_NAME="webkit-mac-11.0.zip" +elif [[ "$BUILD_FLAVOR" == "webkit-mac-11.0-arm64" ]]; then + BROWSER_NAME="webkit" + EXPECTED_HOST_OS="Darwin" + EXPECTED_HOST_OS_VERSION="11.0" + EXPECTED_ARCH="arm64" + BUILD_BLOB_NAME="webkit-mac-11.0-arm64.zip" else echo ERROR: unknown build flavor - "$BUILD_FLAVOR" exit 1 fi +if [[ "$CURRENT_ARCH" != "$EXPECTED_ARCH" ]]; then + echo "ERROR: cannot build $BUILD_FLAVOR" + echo " -- expected arch: $EXPECTED_ARCH" + echo " -- current arch: $CURRENT_ARCH" + exit 1 +fi + if [[ "$CURRENT_HOST_OS" != $EXPECTED_HOST_OS* ]]; then echo "ERROR: cannot build $BUILD_FLAVOR" echo " -- expected OS: $EXPECTED_HOST_OS" diff --git a/browser_patches/tools/check_cdn.sh b/browser_patches/tools/check_cdn.sh index 82dd78fac3..623615cb2f 100755 --- a/browser_patches/tools/check_cdn.sh +++ b/browser_patches/tools/check_cdn.sh @@ -41,6 +41,7 @@ WK_ARCHIVES=( "$HOST/webkit/%s/webkit-ubuntu-20.04.zip" "$HOST/webkit/%s/webkit-mac-10.14.zip" "$HOST/webkit/%s/webkit-mac-10.15.zip" + "$HOST/webkit/%s/webkit-mac-11.0-arm64.zip" "$HOST/webkit/%s/webkit-win64.zip" ) WK_ALIASES=( @@ -48,6 +49,7 @@ WK_ALIASES=( "WK-UBUNTU-20.04" "WK-MAC-10.14" "WK-MAC-10.15" + "WK-MAC-11.0-ARM64" "WK-WIN64" ) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 7fb12bb45c..96ec39ef8b 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1401 -Changed: aslushnikov@gmail.com Tue Dec 8 12:36:33 CST 2020 +1402 +Changed: aslushnikov@gmail.com Tue Dec 8 18:35:08 CST 2020