revert: "fix: use yarn instead of npx with yarn.lock (cypress-io#914)"

This reverts commit e08da49.
MikeMcC399 · Jun 15, 2023 · 8fdbd82 · 8fdbd82
1 parent e08da49
commit 8fdbd82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -74457,8 +74457,6 @@ const useYarn = () => fs.existsSync(yarnFilename)
 const usePnpm = () => fs.existsSync(pnpmLockFilename)
 const useNpm = () => fs.existsSync(packageLockFilename)
 
-const runPrefix = useYarn() ? 'yarn' : 'npx'
-
 const lockHash = () => {
   const lockFilename = useYarn()
     ? yarnFilename
@@ -74637,9 +74635,9 @@ const listCypressBinaries = () => {
   }
 
   core.exportVariable('CYPRESS_CACHE_FOLDER', CYPRESS_CACHE_FOLDER)
-  return io.which(runPrefix, true).then((runPath) => {
+  return io.which('npx', true).then((npxPath) => {
     return exec.exec(
-      quote(runPath),
+      quote(npxPath),
       ['cypress', 'cache', 'list'],
       cypressCommandOptions
     )
@@ -74656,9 +74654,9 @@ const verifyCypressBinary = () => {
   }
 
   core.exportVariable('CYPRESS_CACHE_FOLDER', CYPRESS_CACHE_FOLDER)
-  return io.which(runPrefix, true).then((runPath) => {
+  return io.which('npx', true).then((npxPath) => {
     return exec.exec(
-      quote(runPath),
+      quote(npxPath),
       ['cypress', 'verify'],
       cypressCommandOptions
     )

diff --git a/index.js b/index.js
@@ -106,8 +106,6 @@ const useYarn = () => fs.existsSync(yarnFilename)
 const usePnpm = () => fs.existsSync(pnpmLockFilename)
 const useNpm = () => fs.existsSync(packageLockFilename)
 
-const runPrefix = useYarn() ? 'yarn' : 'npx'
-
 const lockHash = () => {
   const lockFilename = useYarn()
     ? yarnFilename
@@ -286,9 +284,9 @@ const listCypressBinaries = () => {
   }
 
   core.exportVariable('CYPRESS_CACHE_FOLDER', CYPRESS_CACHE_FOLDER)
-  return io.which(runPrefix, true).then((runPath) => {
+  return io.which('npx', true).then((npxPath) => {
     return exec.exec(
-      quote(runPath),
+      quote(npxPath),
       ['cypress', 'cache', 'list'],
       cypressCommandOptions
     )
@@ -305,9 +303,9 @@ const verifyCypressBinary = () => {
   }
 
   core.exportVariable('CYPRESS_CACHE_FOLDER', CYPRESS_CACHE_FOLDER)
-  return io.which(runPrefix, true).then((runPath) => {
+  return io.which('npx', true).then((npxPath) => {
     return exec.exec(
-      quote(runPath),
+      quote(npxPath),
       ['cypress', 'verify'],
       cypressCommandOptions
     )