Merge branch 'develop' into update-v8-snapshot-cache-on-develop

cypress-io · Jun 5, 2023 · 7406580 · 7406580 · cypress-bot · Jun 5, 2023
2 parents 77b2f79 + c1489bd
commit 7406580
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -573,14 +573,15 @@ commands:
               # To make `circleci tests` work correctly, we need to step into the package folder.
               cd packages/<<parameters.package>>
 
-              GLOB="cypress/e2e/**/*cy.*"
-
               if [[ <<parameters.type>> == 'ct' ]]; then
                 # component tests are located side by side with the source codes.
-                GLOB="src/**/*cy.*"
+                # for the app component tests, ignore specs that are known to cause failures on contributor PRs (see https://discuss.circleci.com/t/how-to-exclude-certain-files-from-circleci-test-globbing/41028)
+                TESTFILES=$(find src -regextype posix-extended -name '*.cy.*' -not -regex '.*(FileMatch|PromoAction|SelectorPlayground).cy.*' | circleci tests split --total=$CIRCLE_NODE_TOTAL)
+              else
+                GLOB="cypress/e2e/**/*cy.*"
+                TESTFILES=$(circleci tests glob "$GLOB" | circleci tests split --total=$CIRCLE_NODE_TOTAL)
               fi
 
-              TESTFILES=$(circleci tests glob "$GLOB" | circleci tests split --total=$CIRCLE_NODE_TOTAL)
               echo "Test files for this machine are $TESTFILES"
 
               # To run the `yarn` command, we need to walk out of the package folder.