Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: simplify build script #27547

Merged
merged 6 commits into from
Aug 15, 2023
Merged

chore: simplify build script #27547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee47ce1
chore: simplify build script
astone123 Aug 14, 2023
d6e0958
Merge branch 'develop' into astone123/simplify-build
astone123 Aug 14, 2023
beff6b8
update CI workflows
astone123 Aug 14, 2023
46cd939
fix workflows
astone123 Aug 14, 2023
3a5e992
empty commit because Percy weirdness
astone123 Aug 14, 2023
6573259
Merge branch 'develop' into astone123/simplify-build
astone123 Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions .circleci/workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,10 +1189,6 @@ commands:
command: |
source ./scripts/ensure-node.sh
yarn build --scope cypress
- run:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This runs as a postbuild script, so it will run in the previous step. No need to run it again

name: Copy Re-exported NPM Packages
command: node ./scripts/post-build.js
working_directory: cli
- run:
command: ls -la types
working_directory: cli/build
Expand Down Expand Up @@ -1527,7 +1523,7 @@ jobs:
- run: yarn test-scripts
# make sure packages with TypeScript can be transpiled to JS
- run: yarn lerna run build-prod --stream --concurrency 4
- run: yarn lerna run build --stream --concurrency 4
- run: yarn build --concurrency 4
# run unit tests from each individual package
- run: yarn test
# run type checking for each individual package
Expand Down Expand Up @@ -1910,7 +1906,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn lerna run build --scope @cypress/webpack-preprocessor
command: yarn build --scope @cypress/webpack-preprocessor
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to reference Lerna specifically in these scripts, just call yarn build and pass the arguments through.

- run:
name: Run tests
command: yarn workspace @cypress/webpack-preprocessor test
Expand Down Expand Up @@ -1955,7 +1951,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn lerna run build --scope @cypress/vue
command: yarn build --scope @cypress/vue
- store_test_results:
path: npm/vue/test_results
- store_artifacts:
Expand All @@ -1968,7 +1964,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn lerna run build --scope @cypress/angular
command: yarn build --scope @cypress/angular
- store-npm-logs

npm-react:
Expand All @@ -1977,7 +1973,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn lerna run build --scope @cypress/react
command: yarn build --scope @cypress/react
- run:
name: Run tests
command: yarn test
Expand All @@ -1994,7 +1990,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn lerna run build --scope @cypress/vite-plugin-cypress-esm
command: yarn build --scope @cypress/vite-plugin-cypress-esm
- run:
name: Run tests
command: yarn test
Expand All @@ -2011,7 +2007,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn lerna run build --scope @cypress/mount-utils
command: yarn build --scope @cypress/mount-utils
- store-npm-logs

npm-grep:
Expand All @@ -2033,7 +2029,7 @@ jobs:
resource_class: small
steps:
- restore_cached_workspace
- run: yarn workspace create-cypress-tests build
- run: yarn build --scope create-cypress-tests

npm-eslint-plugin-dev:
<<: *defaults
Expand All @@ -2050,8 +2046,7 @@ jobs:
- run:
name: Build + Install
command: |
yarn lerna run build --scope @cypress/schematic
working_directory: npm/cypress-schematic
yarn build --scope @cypress/schematic
- run:
name: Run unit tests
command: |
Expand Down
6 changes: 5 additions & 1 deletion cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"clean": "node ./scripts/clean.js",
"prebuild": "yarn postinstall && node ./scripts/start-build.js",
"build": "node ./scripts/build.js",
"postbuild": "node ./scripts/post-build.js",
"dtslint": "dtslint types",
"postinstall": "patch-package && node ./scripts/post-install.js",
"size": "t=\"cypress-v0.0.0.tgz\"; yarn pack --filename \"${t}\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
Expand Down Expand Up @@ -185,6 +186,9 @@
"{projectRoot}/build"
]
}
}
},
"implicitDependencies": [
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tells Nx that all of the NPM packages need to be built before the CLI is built. We need to do this because the post-build script in CLI copies the built assets for each NPM package into the cli/build folder, so when that happens, all of the packages need to have already been built.

"@cypress/*"
]
}
}
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"binary-zip": "node ./scripts/binary.js zip",
"binary-package": "cross-env NODE_OPTIONS=--max_old_space_size=8192 node ./scripts/binary.js package",
"check-binary-on-cdn": "node ./scripts/binary.js checkIfBinaryExistsOnCdn",
"build": "yarn build-npm-modules && lerna run build --stream --no-bail --ignore create-cypress-tests --ignore cypress --ignore \"'@packages/{runner}'\" --ignore \"'@cypress/{angular,react,react18,vue,vue2,mount-utils,svelte}'\" && node ./cli/scripts/post-build.js && lerna run build --stream --scope create-cypress-tests",
"build-npm-modules": "lerna run build --scope cypress --scope @cypress/mount-utils --scope @cypress/react && lerna run build --scope \"'@cypress/{angular,react18,vue,vue2,svelte}'\"",
"build": "lerna run build --stream",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to run all of these scripts independently, we can just tell Lerna to build and it will handle the order in which things are built

"build-prod": "lerna run build-prod-ui --stream && lerna run build-prod --stream --ignore create-cypress-tests && node ./cli/scripts/post-build.js && lerna run build-prod --stream --scope create-cypress-tests --scope",
"build-v8-snapshot-dev": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js --env=dev",
"build-v8-snapshot-prod": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js",
Expand Down