Skip to content

Commit c32483a

Browse files
authored
Merge branch '10.0-release' into lmiller1990/UNIFY-1305
2 parents 3c5de3b + 5b4ceed commit c32483a

File tree

1 file changed

+41
-31
lines changed

1 file changed

+41
-31
lines changed

circle.yml

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ mainBuildFilters: &mainBuildFilters
2929
only:
3030
- develop
3131
- 10.0-release
32+
- 10.0-use-contexts
3233

3334
# usually we don't build Mac app - it takes a long time
3435
# but sometimes we want to really confirm we are doing the right thing
@@ -38,6 +39,7 @@ macWorkflowFilters: &mac-workflow-filters
3839
or:
3940
- equal: [ develop, << pipeline.git.branch >> ]
4041
- equal: [ '10.0-release', << pipeline.git.branch >> ]
42+
- equal: [ 10.0-use-contexts, << pipeline.git.branch >> ]
4143
- matches:
4244
pattern: "-release$"
4345
value: << pipeline.git.branch >>
@@ -47,6 +49,7 @@ windowsWorkflowFilters: &windows-workflow-filters
4749
or:
4850
- equal: [ develop, << pipeline.git.branch >> ]
4951
- equal: [ '10.0-release', << pipeline.git.branch >> ]
52+
- equal: [ 10.0-use-contexts, << pipeline.git.branch >> ]
5053
- matches:
5154
pattern: "-release$"
5255
value: << pipeline.git.branch >>
@@ -419,9 +422,9 @@ commands:
419422
echo Current working directory is $PWD
420423
echo Total containers $CIRCLE_NODE_TOTAL
421424
422-
if [[ -v PACKAGES_RECORD_KEY ]]; then
425+
if [[ -v MAIN_RECORD_KEY ]]; then
423426
# internal PR
424-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
427+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
425428
yarn cypress:run --record --parallel --group 5x-driver-<<parameters.browser>> --browser <<parameters.browser>>
426429
else
427430
# external PR
@@ -1416,7 +1419,7 @@ jobs:
14161419
- run:
14171420
command: |
14181421
CYPRESS_KONFIG_ENV=production \
1419-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
1422+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
14201423
PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
14211424
PERCY_ENABLE=${PERCY_TOKEN:-0} \
14221425
PERCY_PARALLEL_TOTAL=-1 \
@@ -1440,7 +1443,7 @@ jobs:
14401443
- run:
14411444
command: |
14421445
CYPRESS_KONFIG_ENV=production \
1443-
CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
1446+
CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
14441447
yarn cypress:run --record --parallel --group ui-components
14451448
working_directory: packages/ui-components
14461449
- verify-mocha-results
@@ -1553,7 +1556,6 @@ jobs:
15531556
- run:
15541557
name: Run tests
15551558
# will use PERCY_TOKEN environment variable if available
1556-
#
15571559
command: |
15581560
CYPRESS_KONFIG_ENV=production \
15591561
PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
@@ -1629,26 +1631,26 @@ jobs:
16291631
command: yarn workspace @cypress/eslint-plugin-dev test
16301632

16311633
npm-cypress-schematic:
1632-
<<: *defaults
1633-
resource_class: small
1634-
steps:
1635-
- restore_cached_workspace
1636-
- run:
1637-
name: Build + Install
1638-
command: |
1639-
yarn workspace @cypress/schematic build:all
1640-
working_directory: npm/cypress-schematic
1641-
- run:
1642-
name: Launch
1643-
command: |
1644-
yarn launch:test
1645-
working_directory: npm/cypress-schematic
1646-
- run:
1647-
name: Run unit tests
1648-
command: |
1649-
yarn test
1650-
working_directory: npm/cypress-schematic
1651-
- store-npm-logs
1634+
<<: *defaults
1635+
resource_class: small
1636+
steps:
1637+
- restore_cached_workspace
1638+
- run:
1639+
name: Build + Install
1640+
command: |
1641+
yarn workspace @cypress/schematic build:all
1642+
working_directory: npm/cypress-schematic
1643+
- run:
1644+
name: Launch
1645+
command: |
1646+
yarn launch:test
1647+
working_directory: npm/cypress-schematic
1648+
- run:
1649+
name: Run unit tests
1650+
command: |
1651+
yarn test
1652+
working_directory: npm/cypress-schematic
1653+
- store-npm-logs
16521654

16531655
npm-release:
16541656
<<: *defaults
@@ -1675,7 +1677,7 @@ jobs:
16751677
- run:
16761678
name: Check current branch to persist artifacts
16771679
command: |
1678-
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "marktnoonan/backmerge-develop-3-8-22" && "$CIRCLE_BRANCH" != "10.0-release" ]]; then
1680+
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-use-contexts" && "$CIRCLE_BRANCH" != "10.0-release" ]]; then
16791681
echo "Not uploading artifacts or posting install comment for this branch."
16801682
circleci-agent step halt
16811683
fi
@@ -2148,6 +2150,7 @@ linux-workflow: &linux-workflow
21482150
- build
21492151
# unit, integration and e2e tests
21502152
- cli-visual-tests:
2153+
context: test-runner:percy
21512154
requires:
21522155
- build
21532156
- unit-tests:
@@ -2188,46 +2191,52 @@ linux-workflow: &linux-workflow
21882191
requires:
21892192
- system-tests-node-modules-install
21902193
- driver-integration-tests-chrome:
2194+
context: test-runner:cypress-record-key
21912195
requires:
21922196
- build
21932197
- driver-integration-tests-chrome-beta:
2198+
context: test-runner:cypress-record-key
21942199
requires:
21952200
- build
21962201
- driver-integration-tests-firefox:
2202+
context: test-runner:cypress-record-key
21972203
requires:
21982204
- build
21992205
- driver-integration-tests-electron:
2206+
context: test-runner:cypress-record-key
22002207
requires:
22012208
- build
22022209
- run-frontend-shared-component-tests-chrome:
2203-
context: test-runner:launchpad-tests
2210+
context: [test-runner:launchpad-tests, test-runner:percy]
22042211
percy: true
22052212
requires:
22062213
- build
22072214
- run-launchpad-integration-tests-chrome:
2208-
context: test-runner:launchpad-tests
2215+
context: [test-runner:launchpad-tests, test-runner:percy]
22092216
percy: true
22102217
requires:
22112218
- build
22122219
- run-launchpad-component-tests-chrome:
2213-
context: test-runner:launchpad-tests
2220+
context: [test-runner:launchpad-tests, test-runner:percy]
22142221
percy: true
22152222
requires:
22162223
- build
22172224
- run-app-integration-tests-chrome:
2218-
context: test-runner:launchpad-tests
2225+
context: [test-runner:launchpad-tests, test-runner:percy]
22192226
percy: true
22202227
requires:
22212228
- build
22222229
- run-app-component-tests-chrome:
2223-
context: test-runner:launchpad-tests
2230+
context: [test-runner:launchpad-tests, test-runner:percy]
22242231
percy: true
22252232
requires:
22262233
- build
22272234
- reporter-integration-tests:
2235+
context: [test-runner:cypress-record-key, test-runner:percy]
22282236
requires:
22292237
- build
22302238
- ui-components-integration-tests:
2239+
context: test-runner:cypress-record-key
22312240
requires:
22322241
- build
22332242
- npm-webpack-dev-server:
@@ -2243,6 +2252,7 @@ linux-workflow: &linux-workflow
22432252
requires:
22442253
- build
22452254
- npm-design-system:
2255+
context: test-runner:percy
22462256
requires:
22472257
- build
22482258
- npm-vue:

0 commit comments

Comments
 (0)