Skip to content

Commit

Permalink
fixing pnpm output issue (#545)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitry-shibanov committed Jul 13, 2022
1 parent ad8542c commit 2fddd88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions dist/cache-save/index.js
Expand Up @@ -59931,7 +59931,7 @@ exports.supportedPackageManagers = {
},
pnpm: {
lockFilePatterns: ['pnpm-lock.yaml'],
getCacheFolderCommand: 'pnpm store path'
getCacheFolderCommand: 'pnpm store path --silent'
},
yarn1: {
lockFilePatterns: ['yarn.lock'],
Expand Down Expand Up @@ -59986,7 +59986,7 @@ exports.getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaite
throw new Error(`Could not get cache folder path for ${packageManager}`);
}
core.debug(`${packageManager} path is ${stdOut}`);
return stdOut;
return stdOut.trim();
});
function isGhes() {
const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
Expand Down
4 changes: 2 additions & 2 deletions dist/setup/index.js
Expand Up @@ -71277,7 +71277,7 @@ exports.supportedPackageManagers = {
},
pnpm: {
lockFilePatterns: ['pnpm-lock.yaml'],
getCacheFolderCommand: 'pnpm store path'
getCacheFolderCommand: 'pnpm store path --silent'
},
yarn1: {
lockFilePatterns: ['yarn.lock'],
Expand Down Expand Up @@ -71332,7 +71332,7 @@ exports.getCacheDirectoryPath = (packageManagerInfo, packageManager) => __awaite
throw new Error(`Could not get cache folder path for ${packageManager}`);
}
core.debug(`${packageManager} path is ${stdOut}`);
return stdOut;
return stdOut.trim();
});
function isGhes() {
const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
Expand Down
4 changes: 2 additions & 2 deletions src/cache-utils.ts
Expand Up @@ -18,7 +18,7 @@ export const supportedPackageManagers: SupportedPackageManagers = {
},
pnpm: {
lockFilePatterns: ['pnpm-lock.yaml'],
getCacheFolderCommand: 'pnpm store path'
getCacheFolderCommand: 'pnpm store path --silent'
},
yarn1: {
lockFilePatterns: ['yarn.lock'],
Expand Down Expand Up @@ -94,7 +94,7 @@ export const getCacheDirectoryPath = async (

core.debug(`${packageManager} path is ${stdOut}`);

return stdOut;
return stdOut.trim();
};

export function isGhes(): boolean {
Expand Down

0 comments on commit 2fddd88

Please sign in to comment.