update lockfile path search

software-mansion · Dec 15, 2023 · 6717c32 · 6717c32
1 parent 064ca49
commit 6717c32
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 23 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/setup-scarb.iml b/.idea/setup-scarb.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -59399,6 +59399,8 @@ var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_);
 // EXTERNAL MODULE: external "path"
 var external_path_ = __nccwpck_require__(1017);
 var external_path_default = /*#__PURE__*/__nccwpck_require__.n(external_path_);
+;// CONCATENATED MODULE: external "fs/promises"
+const promises_namespaceObject = require("fs/promises");
 ;// CONCATENATED MODULE: ./lib/cache-utils.js
 
 
@@ -59407,6 +59409,7 @@ var external_path_default = /*#__PURE__*/__nccwpck_require__.n(external_path_);
 
 
 
+
 const State = {
   CachePrimaryKey: "primary_key",
   CacheMatchedKey: "matched_key",
@@ -59469,16 +59472,13 @@ async function getCacheKey() {
 }
 
 async function getScarbLockfilePath() {
-  const globber = await glob.create("**/Scarb.lock");
-  const lockfiles = await globber.glob();
+  const lockfilePath = path.join(process.env.GITHUB_WORKSPACE, "Scarb.lock");
 
-  if (lockfiles.length === 0) {
+  await fs.access(lockfilePath).catch((_) => {
     throw new Error("failed to find Scarb.lock");
-  }
+  });
 
-  return lockfiles.reduce((prev, next) =>
-    prev.length < next.length ? prev : next,
-  );
+  return lockfilePath;
 }
 
 ;// CONCATENATED MODULE: ./lib/cache-save.js

diff --git a/dist/cache-save/index.js.map b/dist/cache-save/index.js.map
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -60590,6 +60590,7 @@ var glob = __nccwpck_require__(8090);
 
 
 
+
 const State = {
   CachePrimaryKey: "primary_key",
   CacheMatchedKey: "matched_key",
@@ -60652,16 +60653,13 @@ async function getCacheKey() {
 }
 
 async function getScarbLockfilePath() {
-  const globber = await glob.create("**/Scarb.lock");
-  const lockfiles = await globber.glob();
+  const lockfilePath = external_path_default().join(process.env.GITHUB_WORKSPACE, "Scarb.lock");
 
-  if (lockfiles.length === 0) {
+  await promises_default().access(lockfilePath).catch((_) => {
     throw new Error("failed to find Scarb.lock");
-  }
+  });
 
-  return lockfiles.reduce((prev, next) =>
-    prev.length < next.length ? prev : next,
-  );
+  return lockfilePath;
 }
 
 ;// CONCATENATED MODULE: ./lib/cache-restore.js

diff --git a/dist/setup/index.js.map b/dist/setup/index.js.map
diff --git a/lib/cache-utils.js b/lib/cache-utils.js
@@ -4,6 +4,7 @@ import * as glob from "@actions/glob";
 
 import os from "os";
 import path from "path";
+import fs from "fs/promises";
 
 export const State = {
   CachePrimaryKey: "primary_key",
@@ -67,14 +68,11 @@ export async function getCacheKey() {
 }
 
 async function getScarbLockfilePath() {
-  const globber = await glob.create("**/Scarb.lock");
-  const lockfiles = await globber.glob();
+  const lockfilePath = path.join(process.env.GITHUB_WORKSPACE, "Scarb.lock");
 
-  if (lockfiles.length === 0) {
+  await fs.access(lockfilePath).catch((_) => {
     throw new Error("failed to find Scarb.lock");
-  }
+  });
 
-  return lockfiles.reduce((prev, next) =>
-    prev.length < next.length ? prev : next,
-  );
+  return lockfilePath;
 }