chore: Fix darwin build (#16836)

circle.yml

@@ -8,7 +8,6 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - optimize-ci-resource-classes
 
 defaults: &defaults
   parallelism: 1
@@ -42,7 +41,6 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - optimize-ci-resource-classes
   requires:
     - create-build-artifacts
 
@@ -1476,7 +1474,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "optimize-ci-resource-classes" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2111,7 +2109,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - build
     - test-kitchensink:
@@ -2123,7 +2120,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - build
     - create-build-artifacts:
@@ -2173,15 +2169,13 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2190,7 +2184,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - create-build-artifacts
 
@@ -2215,7 +2208,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - create-build-artifacts
 
@@ -2287,7 +2279,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - darwin-create-build-artifacts
 
@@ -2299,7 +2290,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - optimize-ci-resource-classes
         requires:
           - darwin-create-build-artifacts
 

package.json

@@ -12,8 +12,8 @@
     "binary-release": "node ./scripts/binary.js release",
     "binary-upload": "node ./scripts/binary.js upload",
     "binary-zip": "node ./scripts/binary.js zip",
-    "build": "lerna run build --stream",
-    "build-prod": "lerna run build-prod --stream",
+    "build": "lerna run build --stream --ignore create-cypress-tests && lerna run build --stream --scope create-cypress-tests",
+    "build-prod": "lerna run build-prod --stream --ignore create-cypress-tests && lerna run build-prod --stream --scope create-cypress-tests",
     "bump": "node ./scripts/binary.js bump",
     "check-node-version": "node scripts/check-node-version.js",
     "check-terminal": "node scripts/check-terminal.js",