Fix mv3 beta build (#18690)

* Build beta with mv3 enabled

* Ensure firefox manifest is an mv2 version

* Revert "Ensure firefox manifest is an mv2 version"

This reverts commit fed74792b0fec33c3a85f2229eb560559d37afe5.

* Only create beta builds for the chrome platform

* Stop linting firefox for beta

.circleci/config.yml

@@ -143,11 +143,6 @@ workflows:
           requires:
             - prep-deps
             - prep-build
-      - test-mozilla-lint-beta:
-          <<: *rc_branch_only
-          requires:
-            - prep-deps
-            - trigger-beta-build
       - test-mozilla-lint-desktop:
           filters:
             branches:
@@ -176,7 +171,6 @@ workflows:
             - validate-source-maps-desktop
             - validate-source-maps-flask
             - test-mozilla-lint
-            - test-mozilla-lint-beta
             - test-mozilla-lint-desktop
             - test-mozilla-lint-flask
             - test-e2e-chrome
@@ -1144,17 +1138,6 @@ jobs:
           name: test:mozilla-lint
           command: NODE_OPTIONS=--max_old_space_size=3072 yarn mozilla-lint
 
-  test-mozilla-lint-beta:
-    executor: node-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Lint beta for firefox
-          command: |
-            .circleci/scripts/mozilla-lint-beta.sh
-
   test-mozilla-lint-desktop:
     executor: node-browsers
     steps:

.circleci/scripts/mozilla-lint-beta.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -u
-set -o pipefail
-
-current_commit_msg=$(git show -s --format='%s' HEAD)
-
-if [[ $current_commit_msg =~ Version[[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+[-]beta.[[:digit:]]) ]]
-then
-    # filter the commit message like Version v10.24.1-beta.1
-    printf '%s\n' "Linting beta builds for firefox"
-    # Move beta build to dist
-    mv ./dist-beta ./dist
-    # Move beta zips to builds
-    mv ./builds-beta ./builds
-    # test:mozilla-lint
-    export NODE_OPTIONS='--max_old_space_size=3072'
-    yarn mozilla-lint
-else
-    printf '%s\n' 'Commit message does not match commit message for beta pattern; skipping linting for firefox'
-    mkdir dist
-    mkdir builds
-    exit 0
-fi
-
-exit 0

.circleci/scripts/trigger-beta-build.sh

@@ -12,8 +12,9 @@ if [[ $current_commit_msg =~ Version[[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:di
 then
     # filter the commit message like Version v10.24.1-beta.1
     printf '%s\n' "Create a build for $version with beta version $current_commit_msg"
-    yarn build --build-type beta dist
+    export ENABLE_MV3=true
-    yarn build --build-type beta prod
+    yarn build --build-type beta --platform='chrome' dist
+    yarn build --build-type beta --platform='chrome' prod
 else
     printf '%s\n' 'Commit message does not match commit message for beta pattern; skipping beta automation build'
     mkdir dist

development/build/index.js

@@ -73,6 +73,7 @@ async function defineAndRunBuildTasks() {
     shouldLintFenceFiles,
     skipStats,
     version,
+    platform,
   } = await parseArgv();
 
   const isRootTask = ['dist', 'prod', 'test', 'dev'].includes(entryTask);
@@ -135,7 +136,7 @@ async function defineAndRunBuildTasks() {
     });
   }
 
-  const browserPlatforms = ['firefox', 'chrome'];
+  const browserPlatforms = platform ? [platform] : ['firefox', 'chrome'];
 
   const browserVersionMap = getBrowserVersionMap(browserPlatforms, version);
 
@@ -317,6 +318,13 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
           hidden: true,
           type: 'boolean',
         })
+        .option('platform', {
+          default: '',
+          description:
+            'Specify a single browser platform to build for. Either `chrome` or `firefox`',
+          hidden: true,
+          type: 'string',
+        })
         .check((args) => {
           if (!Number.isInteger(args.buildVersion)) {
             throw new Error(
@@ -341,6 +349,7 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
     policyOnly,
     skipStats,
     task,
+    platform,
   } = argv;
 
   // Manually default this to `false` for dev builds only.
@@ -371,6 +380,7 @@ testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
     shouldLintFenceFiles,
     skipStats,
     version,
+    platform,
   };
 }