diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index 858fe78bab..60adb99a3d 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -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" # =========================== diff --git a/browser_patches/firefox-beta/EXPECTED_BUILDS b/browser_patches/firefox-beta/EXPECTED_BUILDS index 2c20c9bbc9..ba09ca278a 100644 --- a/browser_patches/firefox-beta/EXPECTED_BUILDS +++ b/browser_patches/firefox-beta/EXPECTED_BUILDS @@ -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 diff --git a/browser_patches/firefox/EXPECTED_BUILDS b/browser_patches/firefox/EXPECTED_BUILDS index e3226d202f..c85aecf03d 100644 --- a/browser_patches/firefox/EXPECTED_BUILDS +++ b/browser_patches/firefox/EXPECTED_BUILDS @@ -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 diff --git a/browser_patches/webkit/EXPECTED_BUILDS b/browser_patches/webkit/EXPECTED_BUILDS index 1a546dd483..946215777d 100644 --- a/browser_patches/webkit/EXPECTED_BUILDS +++ b/browser_patches/webkit/EXPECTED_BUILDS @@ -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 diff --git a/src/utils/registry.ts b/src/utils/registry.ts index 9323533249..19d34e70f8 100644 --- a/src/utils/registry.ts +++ b/src/utils/registry.ts @@ -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', },