From db0ba7321f9a7e72ec8aa81f06629737166fac08 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 1 Feb 2023 13:09:54 +0100 Subject: [PATCH] Do not throw exception in all cases --- src/cache-restore.ts | 15 +++++++++++---- src/cache-utils.ts | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/cache-restore.ts b/src/cache-restore.ts index 3c9cec2..b25fbb9 100644 --- a/src/cache-restore.ts +++ b/src/cache-restore.ts @@ -47,16 +47,23 @@ export const restoreCache = async ( core.info(`Cache restored from key: ${cacheKey}`); }; -export const findDependencyFile = (packageManager: PackageManagerInfo) => { +export const findDependencyFile = ( + packageManager: PackageManagerInfo, + throwException: boolean = true +) => { let dependencyFile = packageManager.dependencyFilePattern; const workspace = process.env.GITHUB_WORKSPACE!; const rootContent = fs.readdirSync(workspace); const goSumFileExists = rootContent.includes(dependencyFile); if (!goSumFileExists) { - throw new Error( - `Dependencies file is not found in ${workspace}. Supported file pattern: ${dependencyFile}` - ); + if (throwException) { + throw new Error( + `Dependencies file is not found in ${workspace}. Supported file pattern: ${dependencyFile}` + ); + } else { + return ''; + } } return path.join(workspace, dependencyFile); diff --git a/src/cache-utils.ts b/src/cache-utils.ts index a40a205..137dcfe 100644 --- a/src/cache-utils.ts +++ b/src/cache-utils.ts @@ -87,7 +87,7 @@ export async function isCacheEnabled() { const packageManager = getCurrentPackageManager(); const packageManagerInfo = await getPackageManagerInfo(packageManager); - const cachePaths = findDependencyFile(packageManagerInfo); + const cachePaths = findDependencyFile(packageManagerInfo, false); - return cachePaths.length > 0; + return Boolean(cachePaths); }