From 3393df405da66ff2150e0a10f68a13fb893859f0 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Tue, 8 Nov 2022 13:46:37 +0100 Subject: [PATCH] feat(cache-restore): handle the situation when the full path to the file is specified --- dist/setup/index.js | 3 ++- src/cache-restore.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 5f84b7d..fa5e746 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -63053,7 +63053,8 @@ exports.restoreCache = (versionSpec, packageManager, cacheDependencyPath) => __a }); const findDependencyFile = (packageManager) => __awaiter(void 0, void 0, void 0, function* () { let dependencyFile = packageManager.dependencyFilePattern; - const globber = yield glob.create(`**/${dependencyFile}`); + const patterns = [`**/${dependencyFile}`, dependencyFile]; + const globber = yield glob.create(patterns.join('\n')); const files = yield globber.glob(); if (!files.length) { throw new Error(`Dependencies file is not found. Supported file pattern: ${dependencyFile}`); diff --git a/src/cache-restore.ts b/src/cache-restore.ts index c3b5c1a..620f034 100644 --- a/src/cache-restore.ts +++ b/src/cache-restore.ts @@ -48,7 +48,8 @@ export const restoreCache = async ( const findDependencyFile = async (packageManager: PackageManagerInfo) => { let dependencyFile = packageManager.dependencyFilePattern; - const globber = await glob.create(`**/${dependencyFile}`); + const patterns = [`**/${dependencyFile}`, dependencyFile]; + const globber = await glob.create(patterns.join('\n')); const files = await globber.glob(); if (!files.length) {