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/package-lock.json b/package-lock.json index 0ef8288e..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.0", + "sauce-testrunner-utils": "3.0.3-beta.1.0", "typescript": "5.5.3", "webpack": "5.93.0", "xml-js": "^1.6.11", @@ -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" } @@ -14292,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.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", @@ -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/package.json b/package.json index 635c75bc..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.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 baf70fe8..e3b612df 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 || []; @@ -311,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 || ''}`); @@ -318,6 +327,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) => {