Skip to content

Commit fe6d327

Browse files
committedAug 11, 2023
Merge branch 'develop' into chore/merge-develop-v13
2 parents fff7490 + dbddcc1 commit fe6d327

File tree

129 files changed

+9260
-8262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+9260
-8262
lines changed
 

‎.circleci/cache-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Bump this version to force CI to re-create the cache from scratch.
22

3-
07-25-23
3+
08-10-23

‎.circleci/workflows.yml

+10-22
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
5353
- equal: [ develop, << pipeline.git.branch >> ]
5454
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5555
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
56-
- equal: [ 'publish-binary', << pipeline.git.branch >> ]
57-
- equal: [ 'chore/merge_develop_into_release_13', << pipeline.git.branch >> ]
58-
- matches:
59-
pattern: /^release\/\d+\.\d+\.\d+$/
60-
value: << pipeline.git.branch >>
6156

6257
# uncomment & add to the branch conditions below to disable the main linux
6358
# flow if we don't want to test it for a certain branch
@@ -1326,7 +1321,7 @@ jobs:
13261321
- install-required-node
13271322
- run:
13281323
name: Check TS Types
1329-
command: NODE_OPTIONS=--max_old_space_size=4096 yarn gulp checkTs
1324+
command: NODE_OPTIONS=--max_old_space_size=4096 yarn check-ts --concurrency=1
13301325

13311326

13321327
# a special job that keeps polling Circle and when all
@@ -1524,6 +1519,7 @@ jobs:
15241519
- run: yarn test-scripts
15251520
# make sure packages with TypeScript can be transpiled to JS
15261521
- run: yarn lerna run build-prod --stream --concurrency 4
1522+
- run: yarn lerna run build --stream --concurrency 4
15271523
# run unit tests from each individual package
15281524
- run: yarn test
15291525
# run type checking for each individual package
@@ -1567,10 +1563,6 @@ jobs:
15671563
- run:
15681564
name: "Lint types 🧹"
15691565
command: yarn workspace cypress dtslint
1570-
# todo(lachlan): do we need this? yarn check-ts does something very similar
1571-
# - run:
1572-
# name: "TypeScript check 🧩"
1573-
# command: yarn type-check --ignore-progress
15741566
- store-npm-logs
15751567

15761568
server-unit-tests:
@@ -1910,7 +1902,7 @@ jobs:
19101902
- restore_cached_workspace
19111903
- run:
19121904
name: Build
1913-
command: yarn workspace @cypress/webpack-preprocessor build
1905+
command: yarn lerna run build --scope @cypress/webpack-preprocessor
19141906
- run:
19151907
name: Run tests
19161908
command: yarn workspace @cypress/webpack-preprocessor test
@@ -1955,11 +1947,7 @@ jobs:
19551947
- restore_cached_workspace
19561948
- run:
19571949
name: Build
1958-
command: yarn workspace @cypress/vue build
1959-
- run:
1960-
name: Type Check
1961-
command: yarn typecheck
1962-
working_directory: npm/vue
1950+
command: yarn lerna run build --scope @cypress/vue
19631951
- store_test_results:
19641952
path: npm/vue/test_results
19651953
- store_artifacts:
@@ -1972,7 +1960,7 @@ jobs:
19721960
- restore_cached_workspace
19731961
- run:
19741962
name: Build
1975-
command: yarn workspace @cypress/angular build
1963+
command: yarn lerna run build --scope @cypress/angular
19761964
- store-npm-logs
19771965

19781966
npm-react:
@@ -1981,7 +1969,7 @@ jobs:
19811969
- restore_cached_workspace
19821970
- run:
19831971
name: Build
1984-
command: yarn workspace @cypress/react build
1972+
command: yarn lerna run build --scope @cypress/react
19851973
- run:
19861974
name: Run tests
19871975
command: yarn test
@@ -1998,7 +1986,7 @@ jobs:
19981986
- restore_cached_workspace
19991987
- run:
20001988
name: Build
2001-
command: yarn workspace @cypress/vite-plugin-cypress-esm build
1989+
command: yarn lerna run build --scope @cypress/vite-plugin-cypress-esm
20021990
- run:
20031991
name: Run tests
20041992
command: yarn test
@@ -2015,7 +2003,7 @@ jobs:
20152003
- restore_cached_workspace
20162004
- run:
20172005
name: Build
2018-
command: yarn workspace @cypress/mount-utils build
2006+
command: yarn lerna run build --scope @cypress/mount-utils
20192007
- store-npm-logs
20202008

20212009
npm-grep:
@@ -2054,7 +2042,7 @@ jobs:
20542042
- run:
20552043
name: Build + Install
20562044
command: |
2057-
yarn workspace @cypress/schematic build
2045+
yarn lerna run build --scope @cypress/schematic
20582046
working_directory: npm/cypress-schematic
20592047
- run:
20602048
name: Run unit tests
@@ -2254,7 +2242,7 @@ jobs:
22542242
<<: *defaults
22552243
resource_class: small
22562244
docker:
2257-
- image: cypress/base:12.0.0-libgbm
2245+
- image: cypress/base:16.16.0
22582246
steps:
22592247
- restore_workspace_binaries
22602248
- run: mkdir test-binary

0 commit comments

Comments
 (0)
Please sign in to comment.