Merge branch 'develop' into 17191-onboarding-unit-tests-metametrics

.circleci/config.yml

@@ -1097,12 +1097,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Move beta build to dist
-          command: mv ./dist-beta ./dist
-      - run:
-          name: Move beta zips to builds
-          command: mv ./builds-beta ./builds
       - run:
           name: Validate source maps
           command: |
@@ -1157,14 +1151,9 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: Move beta build to dist
-          command: mv ./dist-beta ./dist
-      - run:
-          name: Move beta zips to builds
-          command: mv ./builds-beta ./builds
-      - run:
-          name: test:mozilla-lint
-          command: NODE_OPTIONS=--max_old_space_size=3072 yarn mozilla-lint
+          name: Lint beta for firefox
+          command: |
+            .circleci/scripts/mozilla-lint-beta.sh
 
   test-mozilla-lint-desktop:
     executor: node-browsers

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

@@ -0,0 +1,27 @@
+#!/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/validate-source-maps-beta.sh

@@ -10,6 +10,8 @@ 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
+	mv ./dist-beta ./dist
+	mv ./builds-beta ./builds
     printf '%s\n' "Validate source maps with beta version $current_commit_msg"
     yarn validate-source-maps
 else