Skip to content

Commit bc0e3db

Browse files
committed
Fix find lock file
1 parent 1bcf647 commit bc0e3db

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

dist/cache-save/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61140,7 +61140,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
6114061140
return (mod && mod.__esModule) ? mod : { "default": mod };
6114161141
};
6114261142
Object.defineProperty(exports, "__esModule", ({ value: true }));
61143-
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
61143+
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getPackageManagerWorkingDir = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
6114461144
const core = __importStar(__nccwpck_require__(2186));
6114561145
const exec = __importStar(__nccwpck_require__(1514));
6114661146
const cache = __importStar(__nccwpck_require__(7799));
@@ -61186,8 +61186,9 @@ const getPackageManagerWorkingDir = () => {
6118661186
const cacheDependencyPath = core.getInput('cache-dependency-path');
6118761187
return cacheDependencyPath ? path_1.default.dirname(cacheDependencyPath) : null;
6118861188
};
61189+
exports.getPackageManagerWorkingDir = getPackageManagerWorkingDir;
6118961190
const getPackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
61190-
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, getPackageManagerWorkingDir());
61191+
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, exports.getPackageManagerWorkingDir());
6119161192
if (!stdOut) {
6119261193
throw new Error(`Could not retrieve version of ${packageManager}`);
6119361194
}
@@ -61216,7 +61217,7 @@ const getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void
6121661217
});
6121761218
exports.getPackageManagerInfo = getPackageManagerInfo;
6121861219
const getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
61219-
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, getPackageManagerWorkingDir());
61220+
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, exports.getPackageManagerWorkingDir());
6122061221
if (!stdOut) {
6122161222
throw new Error(`Could not get cache folder path for ${packageManager}`);
6122261223
}

dist/setup/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73059,7 +73059,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
7305973059
exports.restoreCache = restoreCache;
7306073060
const findLockFile = (packageManager) => {
7306173061
const lockFiles = packageManager.lockFilePatterns;
73062-
const workspace = process.env.GITHUB_WORKSPACE;
73062+
const workspace = cache_utils_1.getPackageManagerWorkingDir() || process.env.GITHUB_WORKSPACE;
7306373063
const rootContent = fs_1.default.readdirSync(workspace);
7306473064
const lockFile = lockFiles.find(item => rootContent.includes(item));
7306573065
if (!lockFile) {
@@ -73108,7 +73108,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
7310873108
return (mod && mod.__esModule) ? mod : { "default": mod };
7310973109
};
7311073110
Object.defineProperty(exports, "__esModule", ({ value: true }));
73111-
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
73111+
exports.isCacheFeatureAvailable = exports.isGhes = exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getPackageManagerWorkingDir = exports.getCommandOutput = exports.supportedPackageManagers = void 0;
7311273112
const core = __importStar(__nccwpck_require__(2186));
7311373113
const exec = __importStar(__nccwpck_require__(1514));
7311473114
const cache = __importStar(__nccwpck_require__(7799));
@@ -73154,8 +73154,9 @@ const getPackageManagerWorkingDir = () => {
7315473154
const cacheDependencyPath = core.getInput('cache-dependency-path');
7315573155
return cacheDependencyPath ? path_1.default.dirname(cacheDependencyPath) : null;
7315673156
};
73157+
exports.getPackageManagerWorkingDir = getPackageManagerWorkingDir;
7315773158
const getPackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
73158-
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, getPackageManagerWorkingDir());
73159+
const stdOut = yield exports.getCommandOutput(`${packageManager} ${command}`, exports.getPackageManagerWorkingDir());
7315973160
if (!stdOut) {
7316073161
throw new Error(`Could not retrieve version of ${packageManager}`);
7316173162
}
@@ -73184,7 +73185,7 @@ const getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void
7318473185
});
7318573186
exports.getPackageManagerInfo = getPackageManagerInfo;
7318673187
const getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
73187-
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, getPackageManagerWorkingDir());
73188+
const stdOut = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand, exports.getPackageManagerWorkingDir());
7318873189
if (!stdOut) {
7318973190
throw new Error(`Could not get cache folder path for ${packageManager}`);
7319073191
}

src/cache-restore.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {State} from './constants';
88
import {
99
getCacheDirectoryPath,
1010
getPackageManagerInfo,
11+
getPackageManagerWorkingDir,
1112
PackageManagerInfo
1213
} from './cache-utils';
1314

@@ -55,7 +56,8 @@ export const restoreCache = async (
5556

5657
const findLockFile = (packageManager: PackageManagerInfo) => {
5758
const lockFiles = packageManager.lockFilePatterns;
58-
const workspace = process.env.GITHUB_WORKSPACE!;
59+
const workspace =
60+
getPackageManagerWorkingDir() || process.env.GITHUB_WORKSPACE!;
5961
const rootContent = fs.readdirSync(workspace);
6062

6163
const lockFile = lockFiles.find(item => rootContent.includes(item));

src/cache-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const getCommandOutput = async (
5151
return stdout.trim();
5252
};
5353

54-
const getPackageManagerWorkingDir = (): string | null => {
54+
export const getPackageManagerWorkingDir = (): string | null => {
5555
const projectDir = core.getInput('project-dir');
5656
if (projectDir) {
5757
return projectDir;

0 commit comments

Comments
 (0)