From f7d54db84361a01a3c34ceb9bff84c1f73f5a528 Mon Sep 17 00:00:00 2001 From: "Ivan Zosimov (Akvelon INC)" Date: Tue, 22 Feb 2022 15:42:32 +0300 Subject: [PATCH] Add new file-container for package-managers File package-managers.ts was added. --- dist/cache-save/index.js | 30 ++++++++++++++++++++---------- dist/setup/index.js | 30 ++++++++++++++++++++---------- src/cache-restore.ts | 7 ++----- src/cache-utils.ts | 17 +---------------- src/package-managers.ts | 15 +++++++++++++++ 5 files changed, 58 insertions(+), 41 deletions(-) create mode 100644 src/package-managers.ts diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js index 9bda425..aec7b19 100644 --- a/dist/cache-save/index.js +++ b/dist/cache-save/index.js @@ -3927,14 +3927,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0; +exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = void 0; const exec = __importStar(__webpack_require__(986)); -exports.supportedPackageManagers = { - default: { - dependencyFilePattern: 'go.sum', - getCacheFolderCommand: 'go env GOMODCACHE' - } -}; +const package_managers_1 = __webpack_require__(813); exports.getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, function* () { let { stdout, stderr, exitCode } = yield exec.getExecOutput(toolCommand, undefined, { ignoreReturnCode: true }); if (exitCode) { @@ -3946,10 +3941,10 @@ exports.getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, fu return stdout.trim(); }); exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void 0, function* () { - if (!exports.supportedPackageManagers[packageManager]) { + if (!package_managers_1.supportedPackageManagers[packageManager]) { throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`); } - return exports.supportedPackageManagers[packageManager]; + return package_managers_1.supportedPackageManagers[packageManager]; }); exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () { const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand); @@ -46484,7 +46479,22 @@ run(); /* 810 */, /* 811 */, /* 812 */, -/* 813 */, +/* 813 */ +/***/ (function(__unusedmodule, exports) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +exports.supportedPackageManagers = void 0; +exports.supportedPackageManagers = { + default: { + dependencyFilePattern: 'go.sum', + getCacheFolderCommand: 'go env GOMODCACHE' + } +}; + + +/***/ }), /* 814 */, /* 815 */ /***/ (function(module) { diff --git a/dist/setup/index.js b/dist/setup/index.js index 9cd2a00..2397dd7 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -4171,14 +4171,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = exports.supportedPackageManagers = void 0; +exports.getCacheDirectoryPath = exports.getPackageManagerInfo = exports.getCommandOutput = void 0; const exec = __importStar(__webpack_require__(986)); -exports.supportedPackageManagers = { - default: { - dependencyFilePattern: 'go.sum', - getCacheFolderCommand: 'go env GOMODCACHE' - } -}; +const package_managers_1 = __webpack_require__(813); exports.getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, function* () { let { stdout, stderr, exitCode } = yield exec.getExecOutput(toolCommand, undefined, { ignoreReturnCode: true }); if (exitCode) { @@ -4190,10 +4185,10 @@ exports.getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, fu return stdout.trim(); }); exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void 0, function* () { - if (!exports.supportedPackageManagers[packageManager]) { + if (!package_managers_1.supportedPackageManagers[packageManager]) { throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`); } - return exports.supportedPackageManagers[packageManager]; + return package_managers_1.supportedPackageManagers[packageManager]; }); exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () { const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand); @@ -49856,7 +49851,22 @@ module.exports = require("stream"); /* 810 */, /* 811 */, /* 812 */, -/* 813 */, +/* 813 */ +/***/ (function(__unusedmodule, exports) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +exports.supportedPackageManagers = void 0; +exports.supportedPackageManagers = { + default: { + dependencyFilePattern: 'go.sum', + getCacheFolderCommand: 'go env GOMODCACHE' + } +}; + + +/***/ }), /* 814 */, /* 815 */ /***/ (function(module) { diff --git a/src/cache-restore.ts b/src/cache-restore.ts index 7f5d81c..08438b5 100644 --- a/src/cache-restore.ts +++ b/src/cache-restore.ts @@ -5,11 +5,8 @@ import path from 'path'; import fs from 'fs'; import {State, Outputs} from './constants'; -import { - getCacheDirectoryPath, - getPackageManagerInfo, - PackageManagerInfo -} from './cache-utils'; +import {PackageManagerInfo} from './package-managers'; +import {getCacheDirectoryPath, getPackageManagerInfo} from './cache-utils'; export const restoreCache = async ( packageManager: string, diff --git a/src/cache-utils.ts b/src/cache-utils.ts index dbaca31..0f92004 100644 --- a/src/cache-utils.ts +++ b/src/cache-utils.ts @@ -1,20 +1,5 @@ import * as exec from '@actions/exec'; - -type SupportedPackageManagers = { - [prop: string]: PackageManagerInfo; -}; - -export interface PackageManagerInfo { - dependencyFilePattern: string; - getCacheFolderCommand: string; -} - -export const supportedPackageManagers: SupportedPackageManagers = { - default: { - dependencyFilePattern: 'go.sum', - getCacheFolderCommand: 'go env GOMODCACHE' - } -}; +import {supportedPackageManagers, PackageManagerInfo} from './package-managers'; export const getCommandOutput = async (toolCommand: string) => { let {stdout, stderr, exitCode} = await exec.getExecOutput( diff --git a/src/package-managers.ts b/src/package-managers.ts new file mode 100644 index 0000000..f260461 --- /dev/null +++ b/src/package-managers.ts @@ -0,0 +1,15 @@ +type SupportedPackageManagers = { + [prop: string]: PackageManagerInfo; +}; + +export interface PackageManagerInfo { + dependencyFilePattern: string; + getCacheFolderCommand: string; +} + +export const supportedPackageManagers: SupportedPackageManagers = { + default: { + dependencyFilePattern: 'go.sum', + getCacheFolderCommand: 'go env GOMODCACHE' + } +};