From bdd30bca794a1903065553438a64f6fd2f5cf783 Mon Sep 17 00:00:00 2001 From: Alex Plischke Date: Tue, 30 Jul 2024 16:30:21 -0700 Subject: [PATCH 1/6] debug: spit out node path --- package-lock.json | 5 ++++- src/cypress-runner.ts | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0ef8288e..f9c6dadf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8204,6 +8204,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "engines": { "node": ">=0.8.19" } @@ -15015,7 +15016,8 @@ "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/thenify": { "version": "3.3.1", @@ -15915,6 +15917,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" diff --git a/src/cypress-runner.ts b/src/cypress-runner.ts index baf70fe8..6b636f0a 100644 --- a/src/cypress-runner.ts +++ b/src/cypress-runner.ts @@ -318,6 +318,8 @@ if (require.main === module) { const timeoutSec = 1800; // 30 min const preExecTimeoutSec = 300; // 5 min + console.log(`Node: ${nodeBin}`); + cypressRunner(nodeBin, runCfgPath, suiteName, timeoutSec, preExecTimeoutSec) .then((passed) => process.exit(passed ? 0 : 1)) .catch((err) => { From 58a0c3c2641ab3a06fa2bd54ea9ec0e7ea7d4e42 Mon Sep 17 00:00:00 2001 From: Alex Plischke Date: Wed, 31 Jul 2024 10:37:06 -0700 Subject: [PATCH 2/6] bump: sauce-runner-utils --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9c6dadf..a582cb4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "lodash": "4.17.21", "mkdirp": "^3.0.1", "playwright-webkit": "1.45.2", - "sauce-testrunner-utils": "3.0.0", + "sauce-testrunner-utils": "3.0.1-beta.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", @@ -14293,9 +14293,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/sauce-testrunner-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/sauce-testrunner-utils/-/sauce-testrunner-utils-3.0.0.tgz", - "integrity": "sha512-0W7UuxJ/kOHlDdvFNUnv/HMIp9N8jNHVELkTxwDMZuEXP7EvRSkskaEblmqwCgU/3UxpjgpRxuhxKEj+mbOArA==", + "version": "3.0.1-beta.0", + "resolved": "https://registry.npmjs.org/sauce-testrunner-utils/-/sauce-testrunner-utils-3.0.1-beta.0.tgz", + "integrity": "sha512-hhfeUls0EUNmGu5cYfECTBPP8rphKhA6gVuTcNdiuJoHC6d0tHuTi8n3RZkXtZ1jRsJY+NtHG6xBHFFEHSO9yw==", "dependencies": { "lodash": "^4.17.21", "npm": "^10.8.1", diff --git a/package.json b/package.json index 635c75bc..148a859e 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "lodash": "4.17.21", "mkdirp": "^3.0.1", "playwright-webkit": "1.45.2", - "sauce-testrunner-utils": "3.0.0", + "sauce-testrunner-utils": "3.0.1-beta.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", From 32fa8bc253da113e1faf331fdec7d6cac537ac62 Mon Sep 17 00:00:00 2001 From: Alex Plischke Date: Wed, 31 Jul 2024 10:43:17 -0700 Subject: [PATCH 3/6] debug: reconfigure node context when run with node binary that is not packaged with the runner --- src/cypress-runner.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/cypress-runner.ts b/src/cypress-runner.ts index 6b636f0a..6da557d3 100644 --- a/src/cypress-runner.ts +++ b/src/cypress-runner.ts @@ -273,6 +273,14 @@ async function cypressRunner( ); const nodeCtx = { nodePath: nodeBin, npmPath: npmBin }; + if ( + nodeBin.startsWith('/Volumes/Sauce/node/') || + nodeBin.startsWith('D:\\node\\') + ) { + nodeCtx.nodePath = 'node'; + nodeCtx.npmPath = 'npm'; + } + await prepareNpmEnv(runCfg, nodeCtx); const cypressOpts = getCypressOpts(runCfg, suiteName); const suites = runCfg.suites || []; From 0ee71d2b96010b459936abac154ee90487933918 Mon Sep 17 00:00:00 2001 From: Alex Plischke Date: Wed, 31 Jul 2024 12:33:26 -0700 Subject: [PATCH 4/6] account for platform differences --- package-lock.json | 8 ++++---- package.json | 2 +- src/cypress-runner.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index a582cb4e..846df695 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "lodash": "4.17.21", "mkdirp": "^3.0.1", "playwright-webkit": "1.45.2", - "sauce-testrunner-utils": "3.0.1-beta.0", + "sauce-testrunner-utils": "3.0.2-beta.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", @@ -14293,9 +14293,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/sauce-testrunner-utils": { - "version": "3.0.1-beta.0", - "resolved": "https://registry.npmjs.org/sauce-testrunner-utils/-/sauce-testrunner-utils-3.0.1-beta.0.tgz", - "integrity": "sha512-hhfeUls0EUNmGu5cYfECTBPP8rphKhA6gVuTcNdiuJoHC6d0tHuTi8n3RZkXtZ1jRsJY+NtHG6xBHFFEHSO9yw==", + "version": "3.0.2-beta.0", + "resolved": "https://registry.npmjs.org/sauce-testrunner-utils/-/sauce-testrunner-utils-3.0.2-beta.0.tgz", + "integrity": "sha512-0C8tVYpz/y5mxtKfPd8KPaR7y35yJunYDhPEerjeZ5pInDW1VDmEy51rpe/a6U8ELskoeaCRAc28tYOasvg8fg==", "dependencies": { "lodash": "^4.17.21", "npm": "^10.8.1", diff --git a/package.json b/package.json index 148a859e..5029dfba 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "lodash": "4.17.21", "mkdirp": "^3.0.1", "playwright-webkit": "1.45.2", - "sauce-testrunner-utils": "3.0.1-beta.0", + "sauce-testrunner-utils": "3.0.2-beta.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", diff --git a/src/cypress-runner.ts b/src/cypress-runner.ts index 6da557d3..dbe46e85 100644 --- a/src/cypress-runner.ts +++ b/src/cypress-runner.ts @@ -277,8 +277,8 @@ async function cypressRunner( nodeBin.startsWith('/Volumes/Sauce/node/') || nodeBin.startsWith('D:\\node\\') ) { - nodeCtx.nodePath = 'node'; - nodeCtx.npmPath = 'npm'; + nodeCtx.nodePath = process.platform === 'win32' ? 'node.exe' : 'node'; + nodeCtx.npmPath = process.platform === 'win32' ? 'npm.exe' : 'npm'; } await prepareNpmEnv(runCfg, nodeCtx); From 7d8b54c1014108d7d605adcf79fab98e19628811 Mon Sep 17 00:00:00 2001 From: Alex Plischke Date: Wed, 31 Jul 2024 12:53:01 -0700 Subject: [PATCH 5/6] debug: print what's in path --- .github/workflows/test.yml | 3 +++ src/cypress-runner.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index abef247f..6dbd4690 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -169,6 +169,7 @@ jobs: gsutil cp ./cypress-macos-amd64.zip gs://${{ secrets.GCS_RUNNER_BUCKET }}/cypress-macos-amd64-${{ github.run_id }}.zip bundle-test: + if: false needs: [build-windows-bundle, build-mac-bundle] strategy: max-parallel: 3 @@ -212,6 +213,7 @@ jobs: --select-suite "Cypress - ${{ matrix.os }} - ${{ matrix.browser }}" bundle-tests-with-sc: + if: false needs: [build-windows-bundle, build-mac-bundle] strategy: max-parallel: 3 @@ -272,6 +274,7 @@ jobs: --tunnel-name github-cypress-sc-check-tunnel-${{ matrix.os }}-${{ matrix.browser }} bundle-test-modules: + if: false needs: [build-windows-bundle, build-mac-bundle] strategy: max-parallel: 2 diff --git a/src/cypress-runner.ts b/src/cypress-runner.ts index dbe46e85..e0932417 100644 --- a/src/cypress-runner.ts +++ b/src/cypress-runner.ts @@ -319,6 +319,7 @@ async function cypressRunner( // For dev and test purposes, this allows us to run our Cypress Runner from command line if (require.main === module) { const packageInfo = require(path.join(__dirname, '..', 'package.json')); + console.log(`PATH: ${process.env.PATH}`); console.log(`Sauce Cypress Runner ${packageInfo.version}`); console.log(`Running Cypress ${packageInfo.dependencies?.cypress || ''}`); From a3c9a74f8e58e3316c0f93a83c700001981aedc6 Mon Sep 17 00:00:00 2001 From: Alex Plischke Date: Wed, 31 Jul 2024 14:30:06 -0700 Subject: [PATCH 6/6] baby one more time --- package-lock.json | 8 ++++---- package.json | 2 +- src/cypress-runner.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 846df695..b8330b66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "lodash": "4.17.21", "mkdirp": "^3.0.1", "playwright-webkit": "1.45.2", - "sauce-testrunner-utils": "3.0.2-beta.0", + "sauce-testrunner-utils": "3.0.3-beta.1.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", @@ -14293,9 +14293,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/sauce-testrunner-utils": { - "version": "3.0.2-beta.0", - "resolved": "https://registry.npmjs.org/sauce-testrunner-utils/-/sauce-testrunner-utils-3.0.2-beta.0.tgz", - "integrity": "sha512-0C8tVYpz/y5mxtKfPd8KPaR7y35yJunYDhPEerjeZ5pInDW1VDmEy51rpe/a6U8ELskoeaCRAc28tYOasvg8fg==", + "version": "3.0.3-beta.1.0", + "resolved": "https://registry.npmjs.org/sauce-testrunner-utils/-/sauce-testrunner-utils-3.0.3-beta.1.0.tgz", + "integrity": "sha512-ofhQnwdh9HwE6pE0nPzIuWpdKbDaR+1lcd5yu1vRtZWrHPCaUMVN9MCMuzglOgMEgMwPUoQ2sf8bNvS3wxMPDw==", "dependencies": { "lodash": "^4.17.21", "npm": "^10.8.1", diff --git a/package.json b/package.json index 5029dfba..f05404e7 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "lodash": "4.17.21", "mkdirp": "^3.0.1", "playwright-webkit": "1.45.2", - "sauce-testrunner-utils": "3.0.2-beta.0", + "sauce-testrunner-utils": "3.0.3-beta.1.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", diff --git a/src/cypress-runner.ts b/src/cypress-runner.ts index e0932417..e3b612df 100644 --- a/src/cypress-runner.ts +++ b/src/cypress-runner.ts @@ -277,8 +277,8 @@ async function cypressRunner( nodeBin.startsWith('/Volumes/Sauce/node/') || nodeBin.startsWith('D:\\node\\') ) { - nodeCtx.nodePath = process.platform === 'win32' ? 'node.exe' : 'node'; - nodeCtx.npmPath = process.platform === 'win32' ? 'npm.exe' : 'npm'; + nodeCtx.nodePath = 'node'; + nodeCtx.npmPath = 'npm'; } await prepareNpmEnv(runCfg, nodeCtx);