Apply change request fixes

This commit is contained in:
Sergey Dolin 2023-04-24 11:19:22 +02:00
parent 02b94f2c87
commit 813556063c
3 changed files with 3149 additions and 3904 deletions

3520
dist/cache-save/index.js vendored

File diff suppressed because it is too large Load Diff

3520
dist/setup/index.js vendored

File diff suppressed because it is too large Load Diff

View File

@ -61,13 +61,15 @@ export const getPackageManagerWorkingDir = (): string | null => {
return cacheDependencyPath ? path.dirname(cacheDependencyPath) : null; return cacheDependencyPath ? path.dirname(cacheDependencyPath) : null;
}; };
export const getPackageManagerCommandOutput = (command: string) =>
getCommandOutput(command, getPackageManagerWorkingDir());
export const getPackageManagerVersion = async ( export const getPackageManagerVersion = async (
packageManager: string, packageManager: string,
command: string command: string
) => { ) => {
const stdOut = await getCommandOutput( const stdOut = await getPackageManagerCommandOutput(
`${packageManager} ${command}`, `${packageManager} ${command}`
getPackageManagerWorkingDir()
); );
if (!stdOut) { if (!stdOut) {
@ -101,9 +103,8 @@ export const getCacheDirectoryPath = async (
packageManagerInfo: PackageManagerInfo, packageManagerInfo: PackageManagerInfo,
packageManager: string packageManager: string
) => { ) => {
const stdOut = await getCommandOutput( const stdOut = await getPackageManagerCommandOutput(
packageManagerInfo.getCacheFolderCommand, packageManagerInfo.getCacheFolderCommand
getPackageManagerWorkingDir()
); );
if (!stdOut) { if (!stdOut) {