Skip to content

Commit 7409201

Browse files
dmitry-shibanovdmitry-shibanov
committed
resolving comments
1 parent 5d37868 commit 7409201

File tree

5 files changed

+48
-52
lines changed

5 files changed

+48
-52
lines changed

‎dist/cache-save/index.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39267,7 +39267,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
3926739267
};
3926839268
Object.defineProperty(exports, "__esModule", { value: true });
3926939269
const exec = __importStar(__webpack_require__(986));
39270-
const constants_1 = __webpack_require__(196);
3927139270
const glob = __importStar(__webpack_require__(281));
3927239271
const crypto = __importStar(__webpack_require__(417));
3927339272
const fs = __importStar(__webpack_require__(747));
@@ -39305,7 +39304,7 @@ const getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, func
3930539304
const getpackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
3930639305
const stdOut = yield getCommandOutput(`${packageManager} ${command}`);
3930739306
if (!stdOut) {
39308-
throw new Error(`Could not get version for ${packageManager}`);
39307+
throw new Error(`Could not retrieve version of ${packageManager}`);
3930939308
}
3931039309
if (stdOut.startsWith('1.')) {
3931139310
return '1';
@@ -39314,27 +39313,24 @@ const getpackageManagerVersion = (packageManager, command) => __awaiter(void 0,
3931439313
});
3931539314
exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
3931639315
let packageManagerInfo;
39317-
const arr = Array.of(...Object.values(constants_1.LockType));
39318-
if (arr.includes(packageManager)) {
39319-
return null;
39320-
}
3932139316
if (packageManager === 'npm') {
39322-
packageManagerInfo = exports.supportedPackageManagers.npm;
39317+
return exports.supportedPackageManagers.npm;
3932339318
}
39324-
else {
39319+
else if (packageManager === 'yarn') {
3932539320
const yarnVersion = yield getpackageManagerVersion('yarn', '--version');
3932639321
if (yarnVersion.startsWith('1.')) {
39327-
packageManagerInfo = exports.supportedPackageManagers.yarn1;
39322+
return exports.supportedPackageManagers.yarn1;
3932839323
}
3932939324
else {
39330-
packageManagerInfo = exports.supportedPackageManagers.yarn2;
39325+
return exports.supportedPackageManagers.yarn2;
3933139326
}
3933239327
}
39333-
return packageManagerInfo;
39328+
else {
39329+
return null;
39330+
}
3933439331
});
39335-
exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
39332+
exports.getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
3933639333
const stdOut = yield getCommandOutput(packageManagerInfo.getCacheFolderCommand);
39337-
const packageManager = Object.keys(packageManagerInfo)[0];
3933839334
if (!stdOut) {
3933939335
throw new Error(`Could not get cache folder path for ${packageManager}`);
3934039336
}
@@ -50352,9 +50348,9 @@ const cachePackages = (packageManager) => __awaiter(void 0, void 0, void 0, func
5035250348
const primaryKey = core.getState(constants_1.State.CachePrimaryKey);
5035350349
const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);
5035450350
if (!packageManagerInfo) {
50355-
throw new Error(`Caching for '${packageManager}'is not supported`);
50351+
throw new Error(`Caching for '${packageManager}' is not supported`);
5035650352
}
50357-
const cachePath = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo);
50353+
const cachePath = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo, packageManager);
5035850354
if (primaryKey === state) {
5035950355
core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
5036050356
return;

‎dist/setup/index.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43404,10 +43404,10 @@ const cache_utils_1 = __webpack_require__(452);
4340443404
exports.restoreCache = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
4340543405
const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);
4340643406
if (!packageManagerInfo) {
43407-
throw new Error(`Caching for '${packageManager}'is not supported`);
43407+
throw new Error(`Caching for '${packageManager}' is not supported`);
4340843408
}
4340943409
const platform = process.env.RUNNER_OS;
43410-
const cachePath = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo);
43410+
const cachePath = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo, packageManager);
4341143411
const lockFilePath = findLockFile(packageManagerInfo);
4341243412
const fileHash = yield cache_utils_1.hashFile(lockFilePath);
4341343413
const primaryKey = `${platform}-${packageManager}-${fileHash}`;
@@ -43428,7 +43428,7 @@ const findLockFile = (supportedPackageManager) => {
4342843428
const rootContent = fs_1.default.readdirSync(workspace);
4342943429
const fullLockFile = rootContent.find(item => lockFiles.includes(item));
4343043430
if (!fullLockFile) {
43431-
throw new Error(`package lock file is not found in ${workspace}. Supported file patterns: ${lockFiles.toString()}`);
43431+
throw new Error(`Dependencies lock file is not found in ${workspace}. Supported file patterns: ${lockFiles.toString()}`);
4343243432
}
4343343433
return path_1.default.resolve(fullLockFile);
4343443434
};
@@ -44674,7 +44674,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
4467444674
};
4467544675
Object.defineProperty(exports, "__esModule", { value: true });
4467644676
const exec = __importStar(__webpack_require__(986));
44677-
const constants_1 = __webpack_require__(196);
4467844677
const glob = __importStar(__webpack_require__(281));
4467944678
const crypto = __importStar(__webpack_require__(417));
4468044679
const fs = __importStar(__webpack_require__(747));
@@ -44712,7 +44711,7 @@ const getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, func
4471244711
const getpackageManagerVersion = (packageManager, command) => __awaiter(void 0, void 0, void 0, function* () {
4471344712
const stdOut = yield getCommandOutput(`${packageManager} ${command}`);
4471444713
if (!stdOut) {
44715-
throw new Error(`Could not get version for ${packageManager}`);
44714+
throw new Error(`Could not retrieve version of ${packageManager}`);
4471644715
}
4471744716
if (stdOut.startsWith('1.')) {
4471844717
return '1';
@@ -44721,27 +44720,24 @@ const getpackageManagerVersion = (packageManager, command) => __awaiter(void 0,
4472144720
});
4472244721
exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
4472344722
let packageManagerInfo;
44724-
const arr = Array.of(...Object.values(constants_1.LockType));
44725-
if (arr.includes(packageManager)) {
44726-
return null;
44727-
}
4472844723
if (packageManager === 'npm') {
44729-
packageManagerInfo = exports.supportedPackageManagers.npm;
44724+
return exports.supportedPackageManagers.npm;
4473044725
}
44731-
else {
44726+
else if (packageManager === 'yarn') {
4473244727
const yarnVersion = yield getpackageManagerVersion('yarn', '--version');
4473344728
if (yarnVersion.startsWith('1.')) {
44734-
packageManagerInfo = exports.supportedPackageManagers.yarn1;
44729+
return exports.supportedPackageManagers.yarn1;
4473544730
}
4473644731
else {
44737-
packageManagerInfo = exports.supportedPackageManagers.yarn2;
44732+
return exports.supportedPackageManagers.yarn2;
4473844733
}
4473944734
}
44740-
return packageManagerInfo;
44735+
else {
44736+
return null;
44737+
}
4474144738
});
44742-
exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
44739+
exports.getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaiter(void 0, void 0, void 0, function* () {
4474344740
const stdOut = yield getCommandOutput(packageManagerInfo.getCacheFolderCommand);
44744-
const packageManager = Object.keys(packageManagerInfo)[0];
4474544741
if (!stdOut) {
4474644742
throw new Error(`Could not get cache folder path for ${packageManager}`);
4474744743
}

‎src/cache-restore.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ import {
1515
export const restoreCache = async (packageManager: string) => {
1616
const packageManagerInfo = await getPackageManagerInfo(packageManager);
1717
if (!packageManagerInfo) {
18-
throw new Error(`Caching for '${packageManager}'is not supported`);
18+
throw new Error(`Caching for '${packageManager}' is not supported`);
1919
}
2020
const platform = process.env.RUNNER_OS;
21-
const cachePath = await getCacheDirectoryPath(packageManagerInfo);
2221

22+
const cachePath = await getCacheDirectoryPath(
23+
packageManagerInfo,
24+
packageManager
25+
);
2326
const lockFilePath = findLockFile(packageManagerInfo);
2427
const fileHash = await hashFile(lockFilePath);
28+
2529
const primaryKey = `${platform}-${packageManager}-${fileHash}`;
2630
core.saveState(State.CachePrimaryKey, primaryKey);
2731

@@ -46,7 +50,7 @@ const findLockFile = (supportedPackageManager: PackageInfo) => {
4650
const fullLockFile = rootContent.find(item => lockFiles.includes(item));
4751
if (!fullLockFile) {
4852
throw new Error(
49-
`package lock file is not found in ${workspace}. Supported file patterns: ${lockFiles.toString()}`
53+
`Dependencies lock file is not found in ${workspace}. Supported file patterns: ${lockFiles.toString()}`
5054
);
5155
}
5256

‎src/cache-save.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@ async function run() {
1515
const cachePackages = async (packageManager: string) => {
1616
const state = core.getState(State.CacheMatchedKey);
1717
const primaryKey = core.getState(State.CachePrimaryKey);
18+
1819
const packageManagerInfo = await getPackageManagerInfo(packageManager);
1920
if (!packageManagerInfo) {
20-
throw new Error(`Caching for '${packageManager}'is not supported`);
21+
throw new Error(`Caching for '${packageManager}' is not supported`);
2122
}
22-
const cachePath = await getCacheDirectoryPath(packageManagerInfo);
23+
24+
const cachePath = await getCacheDirectoryPath(
25+
packageManagerInfo,
26+
packageManager
27+
);
2328
if (primaryKey === state) {
2429
core.info(
2530
`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`

‎src/cache-utils.ts

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as stream from 'stream';
77
import * as util from 'util';
88
import * as path from 'path';
99

10-
type SupportedPackageManagers = {
10+
type SupportedPackageManager = {
1111
[prop: string]: PackageInfo;
1212
};
1313

@@ -16,7 +16,7 @@ export interface PackageInfo {
1616
getCacheFolderCommand: string;
1717
}
1818

19-
export const supportedPackageManagers: SupportedPackageManagers = {
19+
export const supportedPackageManagers: SupportedPackageManager = {
2020
npm: {
2121
lockFilePatterns: ['package-lock.json', 'yarn.lock'],
2222
getCacheFolderCommand: 'npm config get cache'
@@ -56,7 +56,7 @@ const getpackageManagerVersion = async (
5656
const stdOut = await getCommandOutput(`${packageManager} ${command}`);
5757

5858
if (!stdOut) {
59-
throw new Error(`Could not get version for ${packageManager}`);
59+
throw new Error(`Could not retrieve version of ${packageManager}`);
6060
}
6161

6262
if (stdOut.startsWith('1.')) {
@@ -68,32 +68,27 @@ const getpackageManagerVersion = async (
6868

6969
export const getPackageManagerInfo = async (packageManager: string) => {
7070
let packageManagerInfo: PackageInfo;
71-
const arr = Array.of<string>(...Object.values(LockType));
72-
if (arr.includes(packageManager)) {
73-
return null;
74-
}
75-
7671
if (packageManager === 'npm') {
77-
packageManagerInfo = supportedPackageManagers.npm;
78-
} else {
72+
return supportedPackageManagers.npm;
73+
} else if (packageManager === 'yarn') {
7974
const yarnVersion = await getpackageManagerVersion('yarn', '--version');
8075
if (yarnVersion.startsWith('1.')) {
81-
packageManagerInfo = supportedPackageManagers.yarn1;
76+
return supportedPackageManagers.yarn1;
8277
} else {
83-
packageManagerInfo = supportedPackageManagers.yarn2;
78+
return supportedPackageManagers.yarn2;
8479
}
80+
} else {
81+
return null;
8582
}
86-
87-
return packageManagerInfo;
8883
};
8984

9085
export const getCacheDirectoryPath = async (
91-
packageManagerInfo: PackageInfo
86+
packageManagerInfo: PackageInfo,
87+
packageManager: string
9288
) => {
9389
const stdOut = await getCommandOutput(
9490
packageManagerInfo.getCacheFolderCommand
9591
);
96-
const packageManager = Object.keys(packageManagerInfo)[0];
9792

9893
if (!stdOut) {
9994
throw new Error(`Could not get cache folder path for ${packageManager}`);

0 commit comments

Comments
 (0)