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
microsoft · Jun 8, 2021 · 12d8c54 · 12d8c54
1 parent bd193ca
commit 12d8c54
Show file tree

Hide file tree

Showing 55 changed files with 46 additions and 46 deletions.
diff --git a/browser_patches/checkout_build_archive_upload.sh b/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

diff --git a/browser_patches/export.sh b/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}"

diff --git a/browser_patches/firefox-stable/.gitignore → browser_patches/firefox-beta/.gitignore b/browser_patches/firefox-stable/.gitignore → browser_patches/firefox-beta/.gitignore
diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER
@@ -0,0 +1,2 @@
+1260
+Changed: lushnikov@chromium.org Mon Jun  7 16:40:07 PDT 2021
diff --git a/browser_patches/firefox-beta/EXPECTED_BUILDS b/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
diff --git a/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh b/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"
diff --git a/browser_patches/firefox-stable/archive.sh → browser_patches/firefox-beta/archive.sh b/browser_patches/firefox-stable/archive.sh → browser_patches/firefox-beta/archive.sh
diff --git a/browser_patches/firefox-stable/build.sh → browser_patches/firefox-beta/build.sh b/browser_patches/firefox-stable/build.sh → browser_patches/firefox-beta/build.sh
diff --git a/browser_patches/firefox-stable/clean.sh → browser_patches/firefox-beta/clean.sh b/browser_patches/firefox-stable/clean.sh → browser_patches/firefox-beta/clean.sh
diff --git a/...hes/firefox-stable/install-preferences.js → ...tches/firefox-beta/install-preferences.js b/...hes/firefox-stable/install-preferences.js → ...tches/firefox-beta/install-preferences.js
diff --git a/..._patches/firefox-stable/juggler/Helper.js → ...er_patches/firefox-beta/juggler/Helper.js b/..._patches/firefox-stable/juggler/Helper.js → ...er_patches/firefox-beta/juggler/Helper.js
diff --git a/...firefox-stable/juggler/NetworkObserver.js → ...s/firefox-beta/juggler/NetworkObserver.js b/...firefox-stable/juggler/NetworkObserver.js → ...s/firefox-beta/juggler/NetworkObserver.js
diff --git a/...s/firefox-stable/juggler/SimpleChannel.js → ...hes/firefox-beta/juggler/SimpleChannel.js b/...s/firefox-stable/juggler/SimpleChannel.js → ...hes/firefox-beta/juggler/SimpleChannel.js
diff --git a/.../firefox-stable/juggler/TargetRegistry.js → ...es/firefox-beta/juggler/TargetRegistry.js b/.../firefox-stable/juggler/TargetRegistry.js → ...es/firefox-beta/juggler/TargetRegistry.js
diff --git a/...efox-stable/juggler/components/juggler.js → ...irefox-beta/juggler/components/juggler.js b/...efox-stable/juggler/components/juggler.js → ...irefox-beta/juggler/components/juggler.js
diff --git a/...table/juggler/components/juggler.manifest → ...-beta/juggler/components/juggler.manifest b/...table/juggler/components/juggler.manifest → ...-beta/juggler/components/juggler.manifest
diff --git a/...refox-stable/juggler/components/moz.build → ...firefox-beta/juggler/components/moz.build b/...refox-stable/juggler/components/moz.build → ...firefox-beta/juggler/components/moz.build
diff --git a/...refox-stable/juggler/content/FrameTree.js → ...firefox-beta/juggler/content/FrameTree.js b/...refox-stable/juggler/content/FrameTree.js → ...firefox-beta/juggler/content/FrameTree.js
diff --git a/...refox-stable/juggler/content/PageAgent.js → ...firefox-beta/juggler/content/PageAgent.js b/...refox-stable/juggler/content/PageAgent.js → ...firefox-beta/juggler/content/PageAgent.js
diff --git a/...firefox-stable/juggler/content/Runtime.js → ...s/firefox-beta/juggler/content/Runtime.js b/...firefox-stable/juggler/content/Runtime.js → ...s/firefox-beta/juggler/content/Runtime.js
diff --git a/...efox-stable/juggler/content/WorkerMain.js → ...irefox-beta/juggler/content/WorkerMain.js b/...efox-stable/juggler/content/WorkerMain.js → ...irefox-beta/juggler/content/WorkerMain.js
diff --git a/...ble/juggler/content/hidden-scrollbars.css → ...eta/juggler/content/hidden-scrollbars.css b/...ble/juggler/content/hidden-scrollbars.css → ...eta/juggler/content/hidden-scrollbars.css
diff --git a/...es/firefox-stable/juggler/content/main.js → ...ches/firefox-beta/juggler/content/main.js b/...es/firefox-stable/juggler/content/main.js → ...ches/firefox-beta/juggler/content/main.js
diff --git a/...ser_patches/firefox-stable/juggler/jar.mn → browser_patches/firefox-beta/juggler/jar.mn b/...ser_patches/firefox-stable/juggler/jar.mn → browser_patches/firefox-beta/juggler/jar.mn
diff --git a/..._patches/firefox-stable/juggler/moz.build → ...er_patches/firefox-beta/juggler/moz.build b/..._patches/firefox-stable/juggler/moz.build → ...er_patches/firefox-beta/juggler/moz.build
diff --git a/...refox-stable/juggler/pipe/components.conf → ...firefox-beta/juggler/pipe/components.conf b/...refox-stable/juggler/pipe/components.conf → ...firefox-beta/juggler/pipe/components.conf
diff --git a/...hes/firefox-stable/juggler/pipe/moz.build → ...tches/firefox-beta/juggler/pipe/moz.build b/...hes/firefox-stable/juggler/pipe/moz.build → ...tches/firefox-beta/juggler/pipe/moz.build
diff --git a/...e/juggler/pipe/nsIRemoteDebuggingPipe.idl → ...a/juggler/pipe/nsIRemoteDebuggingPipe.idl b/...e/juggler/pipe/nsIRemoteDebuggingPipe.idl → ...a/juggler/pipe/nsIRemoteDebuggingPipe.idl
diff --git a/...le/juggler/pipe/nsRemoteDebuggingPipe.cpp → ...ta/juggler/pipe/nsRemoteDebuggingPipe.cpp b/...le/juggler/pipe/nsRemoteDebuggingPipe.cpp → ...ta/juggler/pipe/nsRemoteDebuggingPipe.cpp
diff --git a/...able/juggler/pipe/nsRemoteDebuggingPipe.h → ...beta/juggler/pipe/nsRemoteDebuggingPipe.h b/...able/juggler/pipe/nsRemoteDebuggingPipe.h → ...beta/juggler/pipe/nsRemoteDebuggingPipe.h
diff --git a/...stable/juggler/protocol/BrowserHandler.js → ...x-beta/juggler/protocol/BrowserHandler.js b/...stable/juggler/protocol/BrowserHandler.js → ...x-beta/juggler/protocol/BrowserHandler.js
diff --git a/...fox-stable/juggler/protocol/Dispatcher.js → ...refox-beta/juggler/protocol/Dispatcher.js b/...fox-stable/juggler/protocol/Dispatcher.js → ...refox-beta/juggler/protocol/Dispatcher.js
diff --git a/...ox-stable/juggler/protocol/PageHandler.js → ...efox-beta/juggler/protocol/PageHandler.js b/...ox-stable/juggler/protocol/PageHandler.js → ...efox-beta/juggler/protocol/PageHandler.js
diff --git a/...stable/juggler/protocol/PrimitiveTypes.js → ...x-beta/juggler/protocol/PrimitiveTypes.js b/...stable/juggler/protocol/PrimitiveTypes.js → ...x-beta/juggler/protocol/PrimitiveTypes.js
diff --git a/...refox-stable/juggler/protocol/Protocol.js → ...firefox-beta/juggler/protocol/Protocol.js b/...refox-stable/juggler/protocol/Protocol.js → ...firefox-beta/juggler/protocol/Protocol.js
diff --git a/...ler/screencast/HeadlessWindowCapturer.cpp → ...ler/screencast/HeadlessWindowCapturer.cpp b/...ler/screencast/HeadlessWindowCapturer.cpp → ...ler/screencast/HeadlessWindowCapturer.cpp
diff --git a/...ggler/screencast/HeadlessWindowCapturer.h → ...ggler/screencast/HeadlessWindowCapturer.h b/...ggler/screencast/HeadlessWindowCapturer.h → ...ggler/screencast/HeadlessWindowCapturer.h
diff --git a/.../juggler/screencast/ScreencastEncoder.cpp → .../juggler/screencast/ScreencastEncoder.cpp b/.../juggler/screencast/ScreencastEncoder.cpp → .../juggler/screencast/ScreencastEncoder.cpp
diff --git a/...le/juggler/screencast/ScreencastEncoder.h → ...ta/juggler/screencast/ScreencastEncoder.h b/...le/juggler/screencast/ScreencastEncoder.h → ...ta/juggler/screencast/ScreencastEncoder.h
diff --git a/...ble/juggler/screencast/WebMFileWriter.cpp → ...eta/juggler/screencast/WebMFileWriter.cpp b/...ble/juggler/screencast/WebMFileWriter.cpp → ...eta/juggler/screencast/WebMFileWriter.cpp
diff --git a/...table/juggler/screencast/WebMFileWriter.h → ...-beta/juggler/screencast/WebMFileWriter.h b/...table/juggler/screencast/WebMFileWriter.h → ...-beta/juggler/screencast/WebMFileWriter.h
diff --git a/...stable/juggler/screencast/components.conf → ...x-beta/juggler/screencast/components.conf b/...stable/juggler/screencast/components.conf → ...x-beta/juggler/screencast/components.conf
diff --git a/...refox-stable/juggler/screencast/moz.build → ...firefox-beta/juggler/screencast/moz.build b/...refox-stable/juggler/screencast/moz.build → ...firefox-beta/juggler/screencast/moz.build
diff --git a/...ggler/screencast/nsIScreencastService.idl → ...ggler/screencast/nsIScreencastService.idl b/...ggler/screencast/nsIScreencastService.idl → ...ggler/screencast/nsIScreencastService.idl
diff --git a/...uggler/screencast/nsScreencastService.cpp → ...uggler/screencast/nsScreencastService.cpp b/...uggler/screencast/nsScreencastService.cpp → ...uggler/screencast/nsScreencastService.cpp
diff --git a/.../juggler/screencast/nsScreencastService.h → .../juggler/screencast/nsScreencastService.h b/.../juggler/screencast/nsScreencastService.h → .../juggler/screencast/nsScreencastService.h
diff --git a/...hes/firefox-stable/patches/bootstrap.diff → ...tches/firefox-beta/patches/bootstrap.diff b/...hes/firefox-stable/patches/bootstrap.diff → ...tches/firefox-beta/patches/bootstrap.diff
diff --git a/...stable/preferences/00-playwright-prefs.js → ...x-beta/preferences/00-playwright-prefs.js b/...stable/preferences/00-playwright-prefs.js → ...x-beta/preferences/00-playwright-prefs.js
diff --git a/...firefox-stable/preferences/playwright.cfg → ...s/firefox-beta/preferences/playwright.cfg b/...firefox-stable/preferences/playwright.cfg → ...s/firefox-beta/preferences/playwright.cfg
diff --git a/browser_patches/firefox-stable/BUILD_NUMBER b/browser_patches/firefox-stable/BUILD_NUMBER
diff --git a/browser_patches/firefox-stable/EXPECTED_BUILDS b/browser_patches/firefox-stable/EXPECTED_BUILDS
diff --git a/browser_patches/firefox-stable/UPSTREAM_CONFIG.sh b/browser_patches/firefox-stable/UPSTREAM_CONFIG.sh
diff --git a/browser_patches/firefox/BUILD_NUMBER b/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
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/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"
diff --git a/browser_patches/prepare_checkout.sh b/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}"