Fix find lock file

actions · Apr 11, 2023 · bc0e3db · bc0e3db
1 parent 1bcf647
commit bc0e3db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -61140,7 +61140,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
+exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getPackageManagerWorkingDir = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const exec = __importStar(__nccwpck_require__(1514));
 const cache = __importStar(__nccwpck_require__(7799));
@@ -61186,8 +61186,9 @@ const getPackageManagerWorkingDir = () => {
     const cacheDependencyPath = core.getInput('cache-dependency-path');
     return cacheDependencyPath ? path_1.default.dirname(cacheDependencyPath) : null;
 };
+exports.getPackageManagerWorkingDir = getPackageManagerWorkingDir;
 const getPackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
-    const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, getPackageManagerWorkingDir());
+    const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, exports.getPackageManagerWorkingDir());
     if (!stdOut) {
         throw new Error(`Could not retrieve version of ${packageManager}`);
     }
@@ -61216,7 +61217,7 @@ const getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void
 });
 exports.getPackageManagerInfo = getPackageManagerInfo;
 const getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
-    const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, getPackageManagerWorkingDir());
+    const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, exports.getPackageManagerWorkingDir());
     if (!stdOut) {
         throw new Error(`Could not get cache folder path for ${packageManager}`);
     }

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -73059,7 +73059,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
 exports.restoreCache = restoreCache;
 const findLockFile = (packageManager) => {
     const lockFiles = packageManager.lockFilePatterns;
-    const workspace = process.env.GITHUB_WORKSPACE;
+    const workspace = cache_utils_1.getPackageManagerWorkingDir() || process.env.GITHUB_WORKSPACE;
     const rootContent = fs_1.default.readdirSync(workspace);
     const lockFile = lockFiles.find(item => rootContent.includes(item));
     if (!lockFile) {
@@ -73108,7 +73108,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
+exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getPackageManagerWorkingDir = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const exec = __importStar(__nccwpck_require__(1514));
 const cache = __importStar(__nccwpck_require__(7799));
@@ -73154,8 +73154,9 @@ const getPackageManagerWorkingDir = () => {
     const cacheDependencyPath = core.getInput('cache-dependency-path');
     return cacheDependencyPath ? path_1.default.dirname(cacheDependencyPath) : null;
 };
+exports.getPackageManagerWorkingDir = getPackageManagerWorkingDir;
 const getPackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
-    const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, getPackageManagerWorkingDir());
+    const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, exports.getPackageManagerWorkingDir());
     if (!stdOut) {
         throw new Error(`Could not retrieve version of ${packageManager}`);
     }
@@ -73184,7 +73185,7 @@ const getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void
 });
 exports.getPackageManagerInfo = getPackageManagerInfo;
 const getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
-    const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, getPackageManagerWorkingDir());
+    const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, exports.getPackageManagerWorkingDir());
     if (!stdOut) {
         throw new Error(`Could not get cache folder path for ${packageManager}`);
     }

diff --git a/src/cache-restore.ts b/src/cache-restore.ts
@@ -8,6 +8,7 @@ import {State} from './constants';
 import {
   getCacheDirectoryPath,
   getPackageManagerInfo,
+  getPackageManagerWorkingDir,
   PackageManagerInfo
 } from './cache-utils';
 
@@ -55,7 +56,8 @@ export const restoreCache = async (
 
 const findLockFile = (packageManager: PackageManagerInfo) => {
   const lockFiles = packageManager.lockFilePatterns;
-  const workspace = process.env.GITHUB_WORKSPACE!;
+  const workspace =
+    getPackageManagerWorkingDir() || process.env.GITHUB_WORKSPACE!;
   const rootContent = fs.readdirSync(workspace);
 
   const lockFile = lockFiles.find(item => rootContent.includes(item));

diff --git a/src/cache-utils.ts b/src/cache-utils.ts
@@ -51,7 +51,7 @@ export const getCommandOutput = async (
   return stdout.trim();
 };
 
-const getPackageManagerWorkingDir = (): string | null => {
+export const getPackageManagerWorkingDir = (): string | null => {
   const projectDir = core.getInput('project-dir');
   if (projectDir) {
     return projectDir;