Skip to content

Commit b70d1df

Browse files
committed
add test-runner:cypress-record-key context to jobs
1 parent 085add5 commit b70d1df

File tree

1 file changed

+39
-29
lines changed

1 file changed

+39
-29
lines changed

circle.yml

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mainBuildFilters: &mainBuildFilters
2929
only:
3030
- develop
3131
- 10.0-release
32-
- fix-beta-build-caching
32+
- use-contexts
3333

3434
# usually we don't build Mac app - it takes a long time
3535
# but sometimes we want to really confirm we are doing the right thing
@@ -38,7 +38,7 @@ macWorkflowFilters: &mac-workflow-filters
3838
when:
3939
or:
4040
- equal: [ develop, << pipeline.git.branch >> ]
41-
- equal: [ fix-beta-build-caching, << pipeline.git.branch >> ]
41+
- equal: [ use-contexts, << pipeline.git.branch >> ]
4242
- matches:
4343
pattern: "-release$"
4444
value: << pipeline.git.branch >>
@@ -48,7 +48,7 @@ windowsWorkflowFilters: &windows-workflow-filters
4848
or:
4949
- equal: [ master, << pipeline.git.branch >> ]
5050
- equal: [ develop, << pipeline.git.branch >> ]
51-
- equal: [ fix-beta-build-caching, << pipeline.git.branch >> ]
51+
- equal: [ use-contexts, << pipeline.git.branch >> ]
5252
- matches:
5353
pattern: "-release$"
5454
value: << pipeline.git.branch >>
@@ -418,9 +418,9 @@ commands:
418418
echo Current working directory is $PWD
419419
echo Total containers $CIRCLE_NODE_TOTAL
420420
421-
if [[ -v PACKAGES_RECORD_KEY ]]; then
421+
if [[ -v MAIN_RECORD_KEY ]]; then
422422
# internal PR
423-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
423+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
424424
yarn cypress:run --record --parallel --group 5x-driver-<<parameters.browser>> --browser <<parameters.browser>>
425425
else
426426
# external PR
@@ -455,7 +455,7 @@ commands:
455455
command: |
456456
cmd=$([[ <<parameters.percy>> == 'true' ]] && echo 'yarn percy exec --parallel -- --') || true
457457
CYPRESS_KONFIG_ENV=production \
458-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
458+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
459459
PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
460460
PERCY_ENABLE=${PERCY_TOKEN:-0} \
461461
PERCY_PARALLEL_TOTAL=-1 \
@@ -1330,7 +1330,7 @@ jobs:
13301330
- run:
13311331
command: |
13321332
CYPRESS_KONFIG_ENV=production \
1333-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
1333+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
13341334
PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
13351335
PERCY_ENABLE=${PERCY_TOKEN:-0} \
13361336
PERCY_PARALLEL_TOTAL=-1 \
@@ -1375,7 +1375,7 @@ jobs:
13751375
- run:
13761376
command: |
13771377
CYPRESS_KONFIG_ENV=production \
1378-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
1378+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
13791379
PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
13801380
PERCY_ENABLE=${PERCY_TOKEN:-0} \
13811381
PERCY_PARALLEL_TOTAL=-1 \
@@ -1399,7 +1399,7 @@ jobs:
13991399
- run:
14001400
command: |
14011401
CYPRESS_KONFIG_ENV=production \
1402-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
1402+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
14031403
yarn cypress:run --record --parallel --group ui-components
14041404
working_directory: packages/ui-components
14051405
- verify-mocha-results
@@ -1589,25 +1589,25 @@ jobs:
15891589
command: yarn workspace @cypress/eslint-plugin-dev test
15901590

15911591
npm-cypress-schematic:
1592-
<<: *defaults
1593-
steps:
1594-
- restore_cached_workspace
1595-
- run:
1596-
name: Build + Install
1597-
command: |
1598-
yarn workspace @cypress/schematic build:all
1599-
working_directory: npm/cypress-schematic
1600-
- run:
1601-
name: Launch
1602-
command: |
1603-
yarn launch:test
1604-
working_directory: npm/cypress-schematic
1605-
- run:
1606-
name: Run unit tests
1607-
command: |
1608-
yarn test
1609-
working_directory: npm/cypress-schematic
1610-
- store-npm-logs
1592+
<<: *defaults
1593+
steps:
1594+
- restore_cached_workspace
1595+
- run:
1596+
name: Build + Install
1597+
command: |
1598+
yarn workspace @cypress/schematic build:all
1599+
working_directory: npm/cypress-schematic
1600+
- run:
1601+
name: Launch
1602+
command: |
1603+
yarn launch:test
1604+
working_directory: npm/cypress-schematic
1605+
- run:
1606+
name: Run unit tests
1607+
command: |
1608+
yarn test
1609+
working_directory: npm/cypress-schematic
1610+
- store-npm-logs
16111611

16121612
npm-release:
16131613
<<: *defaults
@@ -1634,7 +1634,7 @@ jobs:
16341634
- run:
16351635
name: Check current branch to persist artifacts
16361636
command: |
1637-
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-beta-build-caching" ]]; then
1637+
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "use-contexts" ]]; then
16381638
echo "Not uploading artifacts or posting install comment for this branch."
16391639
circleci-agent step halt
16401640
fi
@@ -2101,39 +2101,49 @@ linux-workflow: &linux-workflow
21012101
requires:
21022102
- system-tests-node-modules-install
21032103
- driver-integration-tests-chrome:
2104+
context: test-runner:cypress-record-key
21042105
requires:
21052106
- build
21062107
- driver-integration-tests-chrome-beta:
2108+
context: test-runner:cypress-record-key
21072109
requires:
21082110
- build
21092111
- driver-integration-tests-firefox:
2112+
context: test-runner:cypress-record-key
21102113
requires:
21112114
- build
21122115
- driver-integration-tests-electron:
2116+
context: test-runner:cypress-record-key
21132117
requires:
21142118
- build
21152119
- runner-integration-tests-chrome:
2120+
context: test-runner:cypress-record-key
21162121
requires:
21172122
- build
21182123
- runner-integration-tests-firefox:
2124+
context: test-runner:cypress-record-key
21192125
requires:
21202126
- build
21212127
- runner-integration-tests-electron:
2128+
context: test-runner:cypress-record-key
21222129
requires:
21232130
- build
21242131
- runner-ct-integration-tests-chrome:
21252132
requires:
21262133
- build
21272134
- desktop-gui-integration-tests-7x:
2135+
context: test-runner:cypress-record-key
21282136
requires:
21292137
- build
21302138
- desktop-gui-component-tests:
21312139
requires:
21322140
- build
21332141
- reporter-integration-tests:
2142+
context: test-runner:cypress-record-key
21342143
requires:
21352144
- build
21362145
- ui-components-integration-tests:
2146+
context: test-runner:cypress-record-key
21372147
requires:
21382148
- build
21392149
- npm-webpack-dev-server:

0 commit comments

Comments
 (0)