From 69f0b5e3987bbc2bbafd3351171055de0fe300c7 Mon Sep 17 00:00:00 2001 From: KHeo Date: Tue, 3 May 2022 15:50:53 +0900 Subject: [PATCH 1/4] chore: 7x-desktop-gui --- circle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index ddcbfa48eba2..f2473927411d 100644 --- a/circle.yml +++ b/circle.yml @@ -1351,13 +1351,16 @@ jobs: working_directory: packages/desktop-gui - run: command: | + TESTFILES=$(circleci tests glob "cypress/integration/**/*spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) + echo "Test files for this machine are $TESTFILES" + CYPRESS_KONFIG_ENV=production \ CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ PERCY_ENABLE=${PERCY_TOKEN:-0} \ PERCY_PARALLEL_TOTAL=-1 \ yarn percy exec --parallel -- -- \ - yarn cypress:run --record --parallel --group 2x-desktop-gui + yarn cypress:run --record --parallel --group 2x-desktop-gui --spec $TESTFILES working_directory: packages/desktop-gui - verify-mocha-results - store_test_results: From 9c878bc517b5dd97ea898e1ad917ec03cc80f76d Mon Sep 17 00:00:00 2001 From: KHeo Date: Thu, 5 May 2022 15:20:28 +0900 Subject: [PATCH 2/4] fix --- circle.yml | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index f2473927411d..6d25a7b770bf 100644 --- a/circle.yml +++ b/circle.yml @@ -1351,16 +1351,27 @@ jobs: working_directory: packages/desktop-gui - run: command: | - TESTFILES=$(circleci tests glob "cypress/integration/**/*spec.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL) - echo "Test files for this machine are $TESTFILES" + if [[ -v MAIN_RECORD_KEY ]]; then + # internal PR + CYPRESS_KONFIG_ENV=production \ + CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + yarn percy exec --parallel -- -- \ + yarn cypress:run --record --parallel --group 2x-desktop-gui + 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" - CYPRESS_KONFIG_ENV=production \ - CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ - PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ - PERCY_ENABLE=${PERCY_TOKEN:-0} \ - PERCY_PARALLEL_TOTAL=-1 \ - yarn percy exec --parallel -- -- \ - yarn cypress:run --record --parallel --group 2x-desktop-gui --spec $TESTFILES + CYPRESS_KONFIG_ENV=production \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + yarn percy exec --parallel -- -- \ + yarn cypress:run --spec $TESTFILES + fi working_directory: packages/desktop-gui - verify-mocha-results - store_test_results: From b5d439b599244c99f6df0aeb6037b77cb554b8b9 Mon Sep 17 00:00:00 2001 From: KHeo Date: Thu, 5 May 2022 15:26:54 +0900 Subject: [PATCH 3/4] runner config. --- circle.yml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index 6d25a7b770bf..a8b38f47ed25 100644 --- a/circle.yml +++ b/circle.yml @@ -468,13 +468,28 @@ commands: - restore_cached_workspace - run: command: | - cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true - CYPRESS_KONFIG_ENV=production \ - CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ - PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ - PERCY_ENABLE=${PERCY_TOKEN:-0} \ - PERCY_PARALLEL_TOTAL=-1 \ - $cmd yarn workspace @packages/runner cypress:run --record --parallel --group runner-integration-<> --browser <> + if [[ -v MAIN_RECORD_KEY ]]; then + # internal PR + + cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true + CYPRESS_KONFIG_ENV=production \ + CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + $cmd yarn workspace @packages/runner cypress:run --record --parallel --group runner-integration-<> --browser <> + 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 + CYPRESS_KONFIG_ENV=production \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + $cmd yarn workspace @packages/runner cypress:run --browser <> --spec $TESTFILES + fi - verify-mocha-results - store_test_results: path: /tmp/cypress From 9a3eecca5e8e1847c14ac8fa742b189f38051fc5 Mon Sep 17 00:00:00 2001 From: KHeo Date: Thu, 5 May 2022 15:26:54 +0900 Subject: [PATCH 4/4] Revert "runner config." This reverts commit b5d439b599244c99f6df0aeb6037b77cb554b8b9. --- circle.yml | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/circle.yml b/circle.yml index a8b38f47ed25..6d25a7b770bf 100644 --- a/circle.yml +++ b/circle.yml @@ -468,28 +468,13 @@ commands: - restore_cached_workspace - run: command: | - if [[ -v MAIN_RECORD_KEY ]]; then - # internal PR - - cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true - CYPRESS_KONFIG_ENV=production \ - CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ - PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ - PERCY_ENABLE=${PERCY_TOKEN:-0} \ - PERCY_PARALLEL_TOTAL=-1 \ - $cmd yarn workspace @packages/runner cypress:run --record --parallel --group runner-integration-<> --browser <> - 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 - CYPRESS_KONFIG_ENV=production \ - PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ - PERCY_ENABLE=${PERCY_TOKEN:-0} \ - PERCY_PARALLEL_TOTAL=-1 \ - $cmd yarn workspace @packages/runner cypress:run --browser <> --spec $TESTFILES - fi + cmd=$([[ <> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true + CYPRESS_KONFIG_ENV=production \ + CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \ + PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \ + PERCY_ENABLE=${PERCY_TOKEN:-0} \ + PERCY_PARALLEL_TOTAL=-1 \ + $cmd yarn workspace @packages/runner cypress:run --record --parallel --group runner-integration-<> --browser <> - verify-mocha-results - store_test_results: path: /tmp/cypress