Apply change request fixes

This commit is contained in:
Sergey Dolin 2023-04-24 11:19:22 +02:00
parent 95c7969190
commit 3527195992
3 changed files with 3150 additions and 3905 deletions

3520
dist/cache-save/index.js vendored

File diff suppressed because it is too large Load Diff

3522
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;
};
export const getPackageManagerCommandOutput = (command: string) =>
getCommandOutput(command, getPackageManagerWorkingDir());
export const getPackageManagerVersion = async (
packageManager: string,
command: string
) => {
const stdOut = await getCommandOutput(
`${packageManager} ${command}`,
getPackageManagerWorkingDir()
const stdOut = await getPackageManagerCommandOutput(
`${packageManager} ${command}`
);
if (!stdOut) {
@ -101,9 +103,8 @@ export const getCacheDirectoryPath = async (
packageManagerInfo: PackageManagerInfo,
packageManager: string
) => {
const stdOut = await getCommandOutput(
packageManagerInfo.getCacheFolderCommand,
getPackageManagerWorkingDir()
const stdOut = await getPackageManagerCommandOutput(
packageManagerInfo.getCacheFolderCommand
);
if (!stdOut) {