From 30f68a22943d128fe73decb54dae6ede1c8ade9a Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 10:21:15 -0500 Subject: [PATCH 1/5] chore: attempt to not cache electron build --- nx.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nx.json b/nx.json index 8b6e92da797c..ba27fca216a1 100644 --- a/nx.json +++ b/nx.json @@ -28,12 +28,12 @@ }, "namedInputs": { "sharedGlobals": [ - "{workspaceRoot}/scripts", - "{workspaceRoot}/.circleci/cache-version.txt" + "{workspaceRoot}/scripts" ], "default": [ "{projectRoot}/**/*", - "sharedGlobals" + "sharedGlobals", + "{workspaceRoot}/.circleci/cache-version.txt" ], "production": [ "default", diff --git a/package.json b/package.json index de739788bb54..8f2a54b301bc 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", - "build": "lerna run build --stream && lerna run build-cli --stream", + "build": "lerna run build --stream --ignore=@packages/electron && yarn workspace @packages/electron build && lerna run build-cli --stream", "build-prod": "lerna run build-prod --stream && node ./cli/scripts/post-build.js && lerna run build-prod --stream --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", From 7a0c0662c2a684d5a04f12b8faa1522601061d78 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 10:21:20 -0500 Subject: [PATCH 2/5] blank -- run ci From d37ea7e5b9923ec67a2ded9a3d8727536475401a Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 10:30:14 -0500 Subject: [PATCH 3/5] fix -- run ci --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f2a54b301bc..3d646ede8b83 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", - "build": "lerna run build --stream --ignore=@packages/electron && yarn workspace @packages/electron build && lerna run build-cli --stream", + "build": "lerna run --ignore=@packages/electron build --stream && yarn workspace @packages/electron build && lerna run build-cli --stream", "build-prod": "lerna run build-prod --stream && node ./cli/scripts/post-build.js && lerna run build-prod --stream --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", From ea1467093cb599daf2f23104e0c5ee9b4c73471f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 10:45:50 -0500 Subject: [PATCH 4/5] fix -- run ci --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d646ede8b83..bee1e72bbd18 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", - "build": "lerna run --ignore=@packages/electron build --stream && yarn workspace @packages/electron build && lerna run build-cli --stream", + "build": "lerna run build --stream && yarn workspace @packages/electron build && lerna run build-cli --stream", "build-prod": "lerna run build-prod --stream && node ./cli/scripts/post-build.js && lerna run build-prod --stream --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", From 7e635e7984abc1593135e12d98b9df23c06695d6 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 10:56:23 -0500 Subject: [PATCH 5/5] improvement --- package.json | 2 +- packages/electron/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bee1e72bbd18..a24981db367a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", - "build": "lerna run build --stream && yarn workspace @packages/electron build && lerna run build-cli --stream", + "build": "lerna run build --stream && yarn workspace @packages/electron build-binary && lerna run build-cli --stream", "build-prod": "lerna run build-prod --stream && node ./cli/scripts/post-build.js && lerna run build-prod --stream --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", diff --git a/packages/electron/package.json b/packages/electron/package.json index e376d318c25e..4d62d5aa49fc 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -4,7 +4,7 @@ "private": true, "main": "index.js", "scripts": { - "build": "node ./bin/cypress-electron --install", + "build-binary": "node ./bin/cypress-electron --install", "clean-deps": "rimraf node_modules", "postinstall": "echo '@packages/electron needs: yarn build'", "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",