chore: swap firefox-stable and firefox (#6950)

With this patch:
- `//browser_patches/firefox` becomes firefox-stable
- `//browser_patches/firefox-stable` becomes firefox-beta

References #6817

browser_patches/checkout_build_archive_upload.sh

@@ -189,43 +189,43 @@ elif [[ "$BUILD_FLAVOR" == "firefox-win64" ]]; then
 
 
 # ===============================
-#    FIREFOX-STABLE COMPILATION
+#    FIREFOX-BETA COMPILATION
 # ===============================
-elif [[ "$BUILD_FLAVOR" == "firefox-stable-ubuntu-18.04" ]]; then
-  BROWSER_NAME="firefox-stable"
+elif [[ "$BUILD_FLAVOR" == "firefox-beta-ubuntu-18.04" ]]; then
+  BROWSER_NAME="firefox-beta"
   EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Ubuntu"
   EXPECTED_HOST_OS_VERSION="18.04"
-  BUILD_BLOB_NAME="firefox-stable-ubuntu-18.04.zip"
-elif [[ "$BUILD_FLAVOR" == "firefox-stable-ubuntu-20.04" ]]; then
-  BROWSER_NAME="firefox-stable"
+  BUILD_BLOB_NAME="firefox-beta-ubuntu-18.04.zip"
+elif [[ "$BUILD_FLAVOR" == "firefox-beta-ubuntu-20.04" ]]; then
+  BROWSER_NAME="firefox-beta"
   EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Ubuntu"
   EXPECTED_HOST_OS_VERSION="20.04"
-  BUILD_BLOB_NAME="firefox-stable-ubuntu-20.04.zip"
-elif [[ "$BUILD_FLAVOR" == "firefox-stable-mac-10.14" ]]; then
-  BROWSER_NAME="firefox-stable"
+  BUILD_BLOB_NAME="firefox-beta-ubuntu-20.04.zip"
+elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-10.14" ]]; then
+  BROWSER_NAME="firefox-beta"
   EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Darwin"
   EXPECTED_HOST_OS_VERSION="10.14"
-  BUILD_BLOB_NAME="firefox-stable-mac-10.14.zip"
-elif [[ "$BUILD_FLAVOR" == "firefox-stable-mac-11.0-arm64" ]]; then
-  BROWSER_NAME="firefox-stable"
+  BUILD_BLOB_NAME="firefox-beta-mac-10.14.zip"
+elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-11.0-arm64" ]]; then
+  BROWSER_NAME="firefox-beta"
   EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Darwin"
   EXPECTED_HOST_OS_VERSION="11.0"
   EXPECTED_ARCH="arm64"
-  BUILD_BLOB_NAME="firefox-stable-mac-11.0-arm64.zip"
-elif [[ "$BUILD_FLAVOR" == "firefox-stable-win32" ]]; then
-  BROWSER_NAME="firefox-stable"
+  BUILD_BLOB_NAME="firefox-beta-mac-11.0-arm64.zip"
+elif [[ "$BUILD_FLAVOR" == "firefox-beta-win32" ]]; then
+  BROWSER_NAME="firefox-beta"
   EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="MINGW"
-  BUILD_BLOB_NAME="firefox-stable-win32.zip"
-elif [[ "$BUILD_FLAVOR" == "firefox-stable-win64" ]]; then
-  BROWSER_NAME="firefox-stable"
+  BUILD_BLOB_NAME="firefox-beta-win32.zip"
+elif [[ "$BUILD_FLAVOR" == "firefox-beta-win64" ]]; then
+  BROWSER_NAME="firefox-beta"
   EXTRA_BUILD_ARGS="--win64 --full"
   EXPECTED_HOST_OS="MINGW"
-  BUILD_BLOB_NAME="firefox-stable-win64.zip"
+  BUILD_BLOB_NAME="firefox-beta-win64.zip"
 
 # ===========================
 #    WEBKIT COMPILATION

browser_patches/export.sh

@@ -53,16 +53,16 @@ if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
     CHECKOUT_PATH="${FF_CHECKOUT_PATH}"
     FRIENDLY_CHECKOUT_PATH="<FF_CHECKOUT_PATH>"
   fi
-elif [[ ("$1" == "firefox-stable") || ("$1" == "ff-stable") ]]; then
-  # NOTE: firefox-stable re-uses firefox checkout.
+elif [[ ("$1" == "firefox-beta") || ("$1" == "ff-beta") ]]; then
+  # NOTE: firefox-beta re-uses firefox checkout.
   FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
   CHECKOUT_PATH="$PWD/firefox/checkout"
 
-  EXTRA_FOLDER_PW_PATH="$PWD/firefox-stable/juggler"
+  EXTRA_FOLDER_PW_PATH="$PWD/firefox-beta/juggler"
   EXTRA_FOLDER_CHECKOUT_RELPATH="juggler"
-  EXPORT_PATH="$PWD/firefox-stable"
-  BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/firefox-stable/BUILD_NUMBER"
-  source "./firefox-stable/UPSTREAM_CONFIG.sh"
+  EXPORT_PATH="$PWD/firefox-beta"
+  BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/firefox-beta/BUILD_NUMBER"
+  source "./firefox-beta/UPSTREAM_CONFIG.sh"
   if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
     echo "WARNING: using checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}"
     CHECKOUT_PATH="${FF_CHECKOUT_PATH}"

browser_patches/firefox-beta/BUILD_NUMBER

@@ -0,0 +1,2 @@
+1260
+Changed: lushnikov@chromium.org Mon Jun  7 16:40:07 PDT 2021

browser_patches/firefox-beta/EXPECTED_BUILDS

@@ -0,0 +1,5 @@
+firefox-beta-mac-10.14.zip
+firefox-beta-ubuntu-18.04.zip
+firefox-beta-ubuntu-20.04.zip
+firefox-beta-win32.zip
+firefox-beta-win64.zip

browser_patches/firefox-beta/UPSTREAM_CONFIG.sh

@@ -0,0 +1,3 @@
+REMOTE_URL="https://github.com/mozilla/gecko-dev"
+BASE_BRANCH="beta"
+BASE_REVISION="d63e947e90d616f3188e0dcdfd7b8113340a18d5"

browser_patches/firefox-stable/BUILD_NUMBER

@@ -1,2 +0,0 @@
-1259
-Changed: lushnikov@chromium.org Tue Jun  1 19:07:28 PDT 2021

browser_patches/firefox-stable/EXPECTED_BUILDS

@@ -1,5 +0,0 @@
-firefox-stable-mac-10.14.zip
-firefox-stable-ubuntu-18.04.zip
-firefox-stable-ubuntu-20.04.zip
-firefox-stable-win32.zip
-firefox-stable-win64.zip

browser_patches/firefox-stable/UPSTREAM_CONFIG.sh

@@ -1,3 +0,0 @@
-REMOTE_URL="https://github.com/mozilla/gecko-dev"
-BASE_BRANCH="release"
-BASE_REVISION="3862f77749dd50e54c3d9eea32fb59e84d978c96"

browser_patches/firefox/BUILD_NUMBER

@@ -1,2 +1,2 @@
-1268
-Changed: yurys@chromium.org Wed 26 May 2021 03:35:57 PM PDT
+1269
+Changed: lushnikov@chromium.org Mon Jun  7 16:40:07 PDT 2021

browser_patches/firefox/UPSTREAM_CONFIG.sh

@@ -1,3 +1,3 @@
 REMOTE_URL="https://github.com/mozilla/gecko-dev"
-BASE_BRANCH="beta"
-BASE_REVISION="d63e947e90d616f3188e0dcdfd7b8113340a18d5"
+BASE_BRANCH="release"
+BASE_REVISION="3862f77749dd50e54c3d9eea32fb59e84d978c96"

browser_patches/prepare_checkout.sh

@@ -10,7 +10,7 @@ REMOTE_BROWSER_UPSTREAM="browser_upstream"
 BUILD_BRANCH="playwright-build"
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
-  echo "usage: $(basename $0) [firefox|firefox-stable|webkit] [custom_checkout_path]"
+  echo "usage: $(basename $0) [firefox|firefox-beta|webkit] [custom_checkout_path]"
   echo
   echo "Prepares browser checkout. The checkout is a GIT repository that:"
   echo "- has a '$REMOTE_BROWSER_UPSTREAM' remote pointing to a REMOTE_URL from UPSTREAM_CONFIG.sh"
@@ -93,15 +93,15 @@ elif [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then
     CHECKOUT_PATH="${FF_CHECKOUT_PATH}"
     FRIENDLY_CHECKOUT_PATH="<FF_CHECKOUT_PATH>"
   fi
-elif [[ ("$1" == "firefox-stable") || ("$1" == "ff-stable") ]]; then
-  # NOTE: firefox-stable re-uses firefox checkout.
+elif [[ ("$1" == "firefox-beta") || ("$1" == "ff-beta") ]]; then
+  # NOTE: firefox-beta re-uses firefox checkout.
   FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout";
   CHECKOUT_PATH="$PWD/firefox/checkout"
 
-  PATCHES_PATH="$PWD/firefox-stable/patches"
-  FIREFOX_EXTRA_FOLDER_PATH="$PWD/firefox-stable/juggler"
-  BUILD_NUMBER=$(head -1 "$PWD/firefox-stable/BUILD_NUMBER")
-  source "./firefox-stable/UPSTREAM_CONFIG.sh"
+  PATCHES_PATH="$PWD/firefox-beta/patches"
+  FIREFOX_EXTRA_FOLDER_PATH="$PWD/firefox-beta/juggler"
+  BUILD_NUMBER=$(head -1 "$PWD/firefox-beta/BUILD_NUMBER")
+  source "./firefox-beta/UPSTREAM_CONFIG.sh"
   if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
     echo "WARNING: using checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}"
     CHECKOUT_PATH="${FF_CHECKOUT_PATH}"