diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index d3fdaba05d8d..f771771e4caa 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -653,11 +653,6 @@ commands: browser: <> - run: command: | - if [[ $PLATFORM == 'windows' && '<>' == 'chrome' && '<>' == 'app' && '<>' == 'e2e' ]]; then - IS_WINDOWS_APP_INTEGRATION_TEST=true - else - IS_WINDOWS_APP_INTEGRATION_TEST=false - fi echo Current working directory is $PWD echo Total containers $CIRCLE_NODE_TOTAL @@ -665,22 +660,14 @@ commands: # internal PR cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true - if [[ "$IS_WINDOWS_APP_INTEGRATION_TEST" = true ]]; then - echo "on windows running app-integration tests. Skipping flaky tests" - # if windows app integration tests, skip some very flaky tests that fail to load for undetermined reasons - TESTFILES=$(cd packages/<> && /usr/bin/find cypress/e2e -regextype posix-extended -name '*.cy.*' -not -regex '.*(experimentalRetries|reporter.command_errors|ct-framework-errors|reporter-ct-vite|reporter-ct-webpack|reporter.errors|reporter.hooks|cypress-in-cypress|runner.ui|specs|studio).*' | circleci tests split --total=$CIRCLE_NODE_TOTAL) - # Do NOT record on windows packages/app due to encryption issues - $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --spec $TESTFILES - else - DEBUG=<> \ - CYPRESS_CONFIG_ENV=production \ - CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ - PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_WORKSPACE_ID \ - PERCY_ENABLE=${PERCY_TOKEN:-0} \ - PERCY_PARALLEL_TOTAL=-1 \ - CYPRESS_INTERNAL_ENABLE_TELEMETRY="true" \ - $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> - fi + DEBUG=<> \ + CYPRESS_CONFIG_ENV=production \ + CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ + PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_WORKSPACE_ID \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + CYPRESS_INTERNAL_ENABLE_TELEMETRY="true" \ + $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> else # external PR @@ -701,12 +688,6 @@ commands: # To run the `yarn` command, we need to walk out of the package folder. cd ../.. - if [[ "$IS_WINDOWS_APP_INTEGRATION_TEST" = true ]]; then - echo "on windows running app-integration tests. Skipping flaky tests" - # if windows app integration tests, skip some very flaky tests that fail to load for undetermined reasons - TESTFILES=$(cd packages/<> && /usr/bin/find cypress/e2e -regextype posix-extended -name '*.cy.*' -not -regex '.*(experimentalRetries|reporter.command_errors|ct-framework-errors|reporter-ct-vite|reporter-ct-webpack|reporter.errors|reporter.hooks|cypress-in-cypress|runner.ui|specs|studio).*' | circleci tests split --total=$CIRCLE_NODE_TOTAL) - fi - DEBUG=<> \ CYPRESS_CONFIG_ENV=production \ PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_WORKSPACE_ID \