This commit is contained in:
Haneen Mahdin 2022-07-30 04:27:16 +00:00 committed by GitHub
commit 45e87561cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 10 deletions

View file

@ -17,7 +17,7 @@ export async function run() {
const cacheLock = core.getInput('cache'); const cacheLock = core.getInput('cache');
await cachePackages(cacheLock); await cachePackages(cacheLock);
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed((error as Error).message);
} }
} }

View file

@ -47,17 +47,35 @@ export const getCommandOutput = async (toolCommand: string) => {
return stdout.trim(); return stdout.trim();
}; };
const resolvePackageManagerVersionInput = (
packageManager: string
): string | undefined => {
let version = core.getInput(`${packageManager}-version`);
if (version !== '') {
core.info(`Using ${packageManager} with version ${version}.`);
return version;
}
};
const getPackageManagerVersion = async ( const getPackageManagerVersion = async (
packageManager: string, packageManager: string,
command: string command: string
) => { ) => {
const stdOut = await getCommandOutput(`${packageManager} ${command}`); let packageManagerVersion = resolvePackageManagerVersionInput(packageManager);
if (!stdOut) { if (packageManagerVersion) {
throw new Error(`Could not retrieve version of ${packageManager}`); return packageManagerVersion;
} else {
const stdOut = await getCommandOutput(`${packageManager} ${command}`);
if (!stdOut) {
throw new Error(`Could not retrieve version of ${packageManager}`);
}
return stdOut;
} }
return stdOut;
}; };
export const getPackageManagerInfo = async (packageManager: string) => { export const getPackageManagerInfo = async (packageManager: string) => {

View file

@ -116,9 +116,9 @@ export async function getNode(
`Received HTTP status code ${err.httpStatusCode}. This usually indicates the rate limit has been exceeded` `Received HTTP status code ${err.httpStatusCode}. This usually indicates the rate limit has been exceeded`
); );
} else { } else {
core.info(err.message); core.info((err as Error).message);
} }
core.debug(err.stack); core.debug((err as Error).stack!);
core.info('Falling back to download directly from Node'); core.info('Falling back to download directly from Node');
} }
@ -334,7 +334,7 @@ async function resolveVersionFromManifest(
return info?.resolvedVersion; return info?.resolvedVersion;
} catch (err) { } catch (err) {
core.info('Unable to resolve version from manifest...'); core.info('Unable to resolve version from manifest...');
core.debug(err.message); core.debug((err as Error).message);
} }
} }

View file

@ -72,7 +72,7 @@ export async function run() {
`##[add-matcher]${path.join(matchersPath, 'eslint-compact.json')}` `##[add-matcher]${path.join(matchersPath, 'eslint-compact.json')}`
); );
} catch (err) { } catch (err) {
core.setFailed(err.message); core.setFailed((err as Error).message);
} }
} }