From b817e89d51723b2c3e7d62eca54ad0240435ed5a Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 11:49:20 +0900 Subject: [PATCH 01/19] fix: distribute files to machines for external contributors. --- circle.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index 4bdb9eab5e0d..ad3f1451c96a 100644 --- a/circle.yml +++ b/circle.yml @@ -516,14 +516,29 @@ commands: browser: <> - run: command: | - cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true - DEBUG=<> \ - CYPRESS_KONFIG_ENV=production \ - CYPRESS_RECORD_KEY=${TEST_LAUNCHPAD_RECORD_KEY:-$MAIN_RECORD_KEY} \ - PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ - PERCY_ENABLE=${PERCY_TOKEN:-0} \ - PERCY_PARALLEL_TOTAL=-1 \ - $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> + if [[ -v MAIN_RECORD_KEY ]]; then + # internal PR + cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true + DEBUG=<> \ + CYPRESS_KONFIG_ENV=production \ + CYPRESS_RECORD_KEY=${TEST_LAUNCHPAD_RECORD_KEY:-$MAIN_RECORD_KEY} \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> + else + # external PR + TESTFILES=$(circleci tests glob "cypress/integration/**/*spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) + echo "Test files for this machine are $TESTFILES" + + cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true + DEBUG=<> \ + CYPRESS_KONFIG_ENV=production \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --spec $TESTFILES + fi - run: command: | if [[ <> == 'app' && <> == 'true' && -d "packages/app/cypress/screenshots/runner/screenshot/screenshot.cy.tsx/percy" ]]; then From 81677f1866087ea8d2213d05da05053b34a9371f Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:01:32 +0900 Subject: [PATCH 02/19] fix path --- circle.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index ad3f1451c96a..4cef05ec939d 100644 --- a/circle.yml +++ b/circle.yml @@ -528,7 +528,14 @@ commands: $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> else # external PR - TESTFILES=$(circleci tests glob "cypress/integration/**/*spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) + + FOLDER=e2e + + if [[ <> == 'ct' ]] then + FOLDER=component + fi + + TESTFILES=$(circleci tests glob "cypress/$FOLDER/**/*spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true From cbc59f3e347b8432f09763f1470df4d71f241f2b Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:09:08 +0900 Subject: [PATCH 03/19] fix --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 4cef05ec939d..d8c8a05aa9b8 100644 --- a/circle.yml +++ b/circle.yml @@ -531,7 +531,7 @@ commands: FOLDER=e2e - if [[ <> == 'ct' ]] then + if [[ <> == 'ct' ]]; then FOLDER=component fi From 5996fb4a77548fb7d64b35a817dcf93b0baa029d Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:18:39 +0900 Subject: [PATCH 04/19] fix glob --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index d8c8a05aa9b8..b8292db2e266 100644 --- a/circle.yml +++ b/circle.yml @@ -529,13 +529,13 @@ commands: else # external PR - FOLDER=e2e + GLOB="cypress/e2e/**/*spec.*" if [[ <> == 'ct' ]]; then - FOLDER=component + FOLDER="cypress/component/**/*spec.*" fi - TESTFILES=$(circleci tests glob "cypress/$FOLDER/**/*spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) + TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true From 45075abd76b951ba88c4a68170e9a33a55cf3df0 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:27:20 +0900 Subject: [PATCH 05/19] fix --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b8292db2e266..22dad90a526f 100644 --- a/circle.yml +++ b/circle.yml @@ -532,7 +532,7 @@ commands: GLOB="cypress/e2e/**/*spec.*" if [[ <> == 'ct' ]]; then - FOLDER="cypress/component/**/*spec.*" + GLOB="cypress/component/**/*spec.*" fi TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) From 5a6dc71d3df073acfdb004efcb6b4a8f0a5c1bc5 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:31:23 +0900 Subject: [PATCH 06/19] fix glob pattern spec->cy. --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 22dad90a526f..1d3f9ba3b450 100644 --- a/circle.yml +++ b/circle.yml @@ -529,10 +529,10 @@ commands: else # external PR - GLOB="cypress/e2e/**/*spec.*" + GLOB="cypress/e2e/**/*cy.*" if [[ <> == 'ct' ]]; then - GLOB="cypress/component/**/*spec.*" + GLOB="cypress/component/**/*cy.*" fi TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) From 95d7872152bd68f446a559342b1b27b4665f8968 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:42:32 +0900 Subject: [PATCH 07/19] fix --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 1d3f9ba3b450..f5e136ac9707 100644 --- a/circle.yml +++ b/circle.yml @@ -538,13 +538,12 @@ commands: TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" - cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true DEBUG=<> \ CYPRESS_KONFIG_ENV=production \ PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ PERCY_ENABLE=${PERCY_TOKEN:-0} \ PERCY_PARALLEL_TOTAL=-1 \ - $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --spec $TESTFILES + yarn workspace @packages/<> cypress:run:<> --browser <> --spec $TESTFILES fi - run: command: | From cb112440cf86944c8bd13c9d683fac52b99e8b77 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 12:54:37 +0900 Subject: [PATCH 08/19] echo things. --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index f5e136ac9707..2f2163541219 100644 --- a/circle.yml +++ b/circle.yml @@ -516,6 +516,9 @@ commands: browser: <> - run: command: | + echo Current working directory is $PWD + echo Total containers $CIRCLE_NODE_TOTAL + if [[ -v MAIN_RECORD_KEY ]]; then # internal PR cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true @@ -535,6 +538,8 @@ commands: GLOB="cypress/component/**/*cy.*" fi + echo $GLOB + TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" From 6874078dff2f8e0a80873008359bed36e314350b Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 13:05:56 +0900 Subject: [PATCH 09/19] test --- circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 2f2163541219..f4ab1a633da7 100644 --- a/circle.yml +++ b/circle.yml @@ -532,13 +532,14 @@ commands: else # external PR - GLOB="cypress/e2e/**/*cy.*" + GLOB="packages/<>/cypress/e2e/**/*cy.*" if [[ <> == 'ct' ]]; then - GLOB="cypress/component/**/*cy.*" + GLOB="packages/<>/cypress/component/**/*cy.*" fi echo $GLOB + echo $(circleci tests glob $GLOB) TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" From 92cbcb54a22a6f1881c524a9f19b0b64897440d0 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 13:17:05 +0900 Subject: [PATCH 10/19] use cd. --- circle.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index f4ab1a633da7..d08e79f1a8b3 100644 --- a/circle.yml +++ b/circle.yml @@ -532,10 +532,12 @@ commands: else # external PR - GLOB="packages/<>/cypress/e2e/**/*cy.*" + cd packages/<> + + GLOB="cypress/e2e/**/*cy.*" if [[ <> == 'ct' ]]; then - GLOB="packages/<>/cypress/component/**/*cy.*" + GLOB="cypress/component/**/*cy.*" fi echo $GLOB @@ -544,6 +546,8 @@ commands: TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" + cd ../.. + DEBUG=<> \ CYPRESS_KONFIG_ENV=production \ PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ From 803f8fba4efd1b2bf3b4661a084f8e1abacc162b Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 15 Jun 2022 13:26:32 +0900 Subject: [PATCH 11/19] fix component tests. --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index d08e79f1a8b3..fbcf5ab6ae5e 100644 --- a/circle.yml +++ b/circle.yml @@ -532,20 +532,20 @@ commands: else # external PR + # To make `circleci tests` work correctly, we need to step into the package folder. cd packages/<> GLOB="cypress/e2e/**/*cy.*" if [[ <> == 'ct' ]]; then - GLOB="cypress/component/**/*cy.*" + # component tests are located side by side with the source codes. + GLOB="src/**/*cy.*" fi - echo $GLOB - echo $(circleci tests glob $GLOB) - 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. cd ../.. DEBUG=<> \ From b46c02996d98b6463a1ffe84c93c4ecc3895499b Mon Sep 17 00:00:00 2001 From: KHeo Date: Thu, 16 Jun 2022 14:55:27 +0900 Subject: [PATCH 12/19] test --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index fbcf5ab6ae5e..f89959592aed 100644 --- a/circle.yml +++ b/circle.yml @@ -542,6 +542,8 @@ commands: GLOB="src/**/*cy.*" fi + echo $(circleci tests glob $GLOB) + TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" From b1d441d4b95ef25c27c79fd04d0b60533483b2df Mon Sep 17 00:00:00 2001 From: KHeo Date: Thu, 16 Jun 2022 15:11:07 +0900 Subject: [PATCH 13/19] test --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f89959592aed..965c1002689c 100644 --- a/circle.yml +++ b/circle.yml @@ -542,7 +542,7 @@ commands: GLOB="src/**/*cy.*" fi - echo $(circleci tests glob $GLOB) + echo $(circleci tests glob "$GLOB") TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) echo "Test files for this machine are $TESTFILES" From cca4796447af0acb069793b42776eeb6fdc31896 Mon Sep 17 00:00:00 2001 From: KHeo Date: Thu, 16 Jun 2022 15:20:11 +0900 Subject: [PATCH 14/19] fix --- circle.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 965c1002689c..4280fce9e49b 100644 --- a/circle.yml +++ b/circle.yml @@ -542,9 +542,7 @@ commands: GLOB="src/**/*cy.*" fi - echo $(circleci tests glob "$GLOB") - - TESTFILES=$(circleci tests glob $GLOB | circleci tests split --total=$CIRCLE_NODE_TOTAL) + 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. From 21a8ad9211242e86538ab9b4b87acb59af4608b4 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 22 Jun 2022 12:30:03 +0900 Subject: [PATCH 15/19] refactor --- circle.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index 4280fce9e49b..d298b15ecf28 100644 --- a/circle.yml +++ b/circle.yml @@ -366,6 +366,13 @@ commands: ## * https://unix.stackexchange.com/questions/43945/whats-the-difference-between-various-term-variables command: yarn check-terminal + print-ci-settings: + steps: + - run: + command: | + echo Current working directory is $PWD + echo Total containers $CIRCLE_NODE_TOTAL + install-required-node: # https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2 description: Install Node version matching .node-version @@ -437,13 +444,11 @@ commands: - install-chrome: channel: <> version: $(node ./scripts/get-browser-version.js chrome:<>) + - print-ci-settings - run: environment: CYPRESS_KONFIG_ENV: production command: | - echo Current working directory is $PWD - echo Total containers $CIRCLE_NODE_TOTAL - if [[ -v MAIN_RECORD_KEY ]]; then # internal PR if <>; then @@ -514,11 +519,9 @@ commands: - restore_cached_workspace - windows-install-chrome: browser: <> + - print-ci-settings - run: command: | - echo Current working directory is $PWD - echo Total containers $CIRCLE_NODE_TOTAL - if [[ -v MAIN_RECORD_KEY ]]; then # internal PR cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true From 15c36065cab1d7dd3fa6213144ca442509cbca53 Mon Sep 17 00:00:00 2001 From: KHeo Date: Mon, 27 Jun 2022 15:08:32 +0900 Subject: [PATCH 16/19] test distribut-step fix error fix fix test TEST --- circle.yml | 56 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/circle.yml b/circle.yml index d298b15ecf28..3686ba0d9166 100644 --- a/circle.yml +++ b/circle.yml @@ -366,13 +366,45 @@ commands: ## * https://unix.stackexchange.com/questions/43945/whats-the-difference-between-various-term-variables command: yarn check-terminal - print-ci-settings: + distribute-test-files-for-external-contributors: + parameters: + package: + description: package to target + type: enum + enum: ['frontend-shared', 'launchpad', 'app', 'reporter', 'driver'] + type: + description: ct or e2e + type: enum + enum: ['ct', 'e2e'] steps: - run: + name: Distribute test files for external contributors. command: | echo Current working directory is $PWD echo Total containers $CIRCLE_NODE_TOTAL + if ! [[ -v MAIN_RECORD_KEY ]]; then + # To make `circleci tests` work correctly, we need to step into the package folder. + cd packages/<> + + GLOB="cypress/e2e/**/*cy.*" + + if [[ <> == 'ct' ]]; then + # component tests are located side by side with the source codes. + GLOB="src/**/*cy.*" + fi + + echo "export TESTFILES=$(circleci tests glob \"$GLOB\" | circleci tests split --total=$CIRCLE_NODE_TOTAL)" >> $BASH_ENV + echo "Test files for this machine are $TESTFILES" + + if [[ -z "$TESTFILES" ]]; then + echo "Empty list of test files" + fi + + # To run the `yarn` command, we need to walk out of the package folder. + cd ../.. + fi + install-required-node: # https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2 description: Install Node version matching .node-version @@ -444,7 +476,6 @@ commands: - install-chrome: channel: <> version: $(node ./scripts/get-browser-version.js chrome:<>) - - print-ci-settings - run: environment: CYPRESS_KONFIG_ENV: production @@ -519,7 +550,9 @@ commands: - restore_cached_workspace - windows-install-chrome: browser: <> - - print-ci-settings + - distribute-test-files-for-external-contributors: + package: <> + type: <> - run: command: | if [[ -v MAIN_RECORD_KEY ]]; then @@ -534,23 +567,6 @@ commands: $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> else # external PR - - # To make `circleci tests` work correctly, we need to step into the package folder. - cd packages/<> - - GLOB="cypress/e2e/**/*cy.*" - - if [[ <> == 'ct' ]]; then - # component tests are located side by side with the source codes. - GLOB="src/**/*cy.*" - 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. - cd ../.. - DEBUG=<> \ CYPRESS_KONFIG_ENV=production \ PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ From 08cef215fb5678cc0ada971ae47aca36e5e74bfe Mon Sep 17 00:00:00 2001 From: KHeo Date: Mon, 27 Jun 2022 15:08:32 +0900 Subject: [PATCH 17/19] Revert "test distribut-step" This reverts commit 15c36065cab1d7dd3fa6213144ca442509cbca53. --- circle.yml | 56 +++++++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/circle.yml b/circle.yml index 3686ba0d9166..d298b15ecf28 100644 --- a/circle.yml +++ b/circle.yml @@ -366,45 +366,13 @@ commands: ## * https://unix.stackexchange.com/questions/43945/whats-the-difference-between-various-term-variables command: yarn check-terminal - distribute-test-files-for-external-contributors: - parameters: - package: - description: package to target - type: enum - enum: ['frontend-shared', 'launchpad', 'app', 'reporter', 'driver'] - type: - description: ct or e2e - type: enum - enum: ['ct', 'e2e'] + print-ci-settings: steps: - run: - name: Distribute test files for external contributors. command: | echo Current working directory is $PWD echo Total containers $CIRCLE_NODE_TOTAL - if ! [[ -v MAIN_RECORD_KEY ]]; then - # To make `circleci tests` work correctly, we need to step into the package folder. - cd packages/<> - - GLOB="cypress/e2e/**/*cy.*" - - if [[ <> == 'ct' ]]; then - # component tests are located side by side with the source codes. - GLOB="src/**/*cy.*" - fi - - echo "export TESTFILES=$(circleci tests glob \"$GLOB\" | circleci tests split --total=$CIRCLE_NODE_TOTAL)" >> $BASH_ENV - echo "Test files for this machine are $TESTFILES" - - if [[ -z "$TESTFILES" ]]; then - echo "Empty list of test files" - fi - - # To run the `yarn` command, we need to walk out of the package folder. - cd ../.. - fi - install-required-node: # https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2 description: Install Node version matching .node-version @@ -476,6 +444,7 @@ commands: - install-chrome: channel: <> version: $(node ./scripts/get-browser-version.js chrome:<>) + - print-ci-settings - run: environment: CYPRESS_KONFIG_ENV: production @@ -550,9 +519,7 @@ commands: - restore_cached_workspace - windows-install-chrome: browser: <> - - distribute-test-files-for-external-contributors: - package: <> - type: <> + - print-ci-settings - run: command: | if [[ -v MAIN_RECORD_KEY ]]; then @@ -567,6 +534,23 @@ commands: $cmd yarn workspace @packages/<> cypress:run:<> --browser <> --record --parallel --group <>-<> else # external PR + + # To make `circleci tests` work correctly, we need to step into the package folder. + cd packages/<> + + GLOB="cypress/e2e/**/*cy.*" + + if [[ <> == 'ct' ]]; then + # component tests are located side by side with the source codes. + GLOB="src/**/*cy.*" + 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. + cd ../.. + DEBUG=<> \ CYPRESS_KONFIG_ENV=production \ PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ From 1ae1a314c514786b9f0341e91957049bf5d5c8b9 Mon Sep 17 00:00:00 2001 From: KHeo Date: Wed, 22 Jun 2022 12:30:03 +0900 Subject: [PATCH 18/19] Revert "refactor" This reverts commit 21a8ad9211242e86538ab9b4b87acb59af4608b4. --- circle.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index d298b15ecf28..4280fce9e49b 100644 --- a/circle.yml +++ b/circle.yml @@ -366,13 +366,6 @@ commands: ## * https://unix.stackexchange.com/questions/43945/whats-the-difference-between-various-term-variables command: yarn check-terminal - print-ci-settings: - steps: - - run: - command: | - echo Current working directory is $PWD - echo Total containers $CIRCLE_NODE_TOTAL - install-required-node: # https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2 description: Install Node version matching .node-version @@ -444,11 +437,13 @@ commands: - install-chrome: channel: <> version: $(node ./scripts/get-browser-version.js chrome:<>) - - print-ci-settings - run: environment: CYPRESS_KONFIG_ENV: production command: | + echo Current working directory is $PWD + echo Total containers $CIRCLE_NODE_TOTAL + if [[ -v MAIN_RECORD_KEY ]]; then # internal PR if <>; then @@ -519,9 +514,11 @@ commands: - restore_cached_workspace - windows-install-chrome: browser: <> - - print-ci-settings - run: command: | + echo Current working directory is $PWD + echo Total containers $CIRCLE_NODE_TOTAL + if [[ -v MAIN_RECORD_KEY ]]; then # internal PR cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true From 42dbe5497004dc02d6c9b99904fce90014c2379d Mon Sep 17 00:00:00 2001 From: Lachlan Miller Date: Tue, 28 Jun 2022 08:01:01 +1000 Subject: [PATCH 19/19] reduce flake by increasing viewport height --- packages/app/cypress/e2e/specs.cy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/cypress/e2e/specs.cy.ts b/packages/app/cypress/e2e/specs.cy.ts index 1716658ce2e4..d71a2e703e12 100644 --- a/packages/app/cypress/e2e/specs.cy.ts +++ b/packages/app/cypress/e2e/specs.cy.ts @@ -95,7 +95,7 @@ describe('App: Specs', () => { const expectedScaffoldPathsForPlatform = expectedScaffoldPaths.map(getPathForPlatform) - it('scaffolds example files when card is clicked', () => { + it('scaffolds example files when card is clicked', { viewportHeight: 1200 }, () => { cy.get('@ScaffoldCard').click() cy.findByRole('dialog', {