Have a single isMatch for checking changed files

joshdales · Apr 13, 2023 · d4d4a10 · d4d4a10
1 parent 7f169bc
commit d4d4a10
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/src/changedFiles.ts b/src/changedFiles.ts
@@ -49,21 +49,7 @@ function printPattern(matcher: Minimatch): string {
   return (matcher.negate ? '!' : '') + matcher.pattern;
 }
 
-function isAnyMatch(changedFile: string, matchers: Minimatch[]): boolean {
-  core.debug(`    matching patterns against file ${changedFile}`);
-  for (const matcher of matchers) {
-    core.debug(`     - ${printPattern(matcher)}`);
-    if (matcher.match(changedFile)) {
-      core.debug(`    ${printPattern(matcher)} matched`);
-      return true;
-    }
-  }
-
-  core.debug(`    no patterns matched`);
-  return false;
-}
-
-function isAllMatch(changedFile: string, matchers: Minimatch[]): boolean {
+function isMatch(changedFile: string, matchers: Minimatch[]): boolean {
   core.debug(`    matching patterns against file ${changedFile}`);
   for (const matcher of matchers) {
     core.debug(`     - ${printPattern(matcher)}`);
@@ -83,7 +69,7 @@ export function checkAnyChangedFiles(
 ): boolean {
   const matchers = globs.map(g => new Minimatch(g));
   for (const changedFile of changedFiles) {
-    if (isAnyMatch(changedFile, matchers)) {
+    if (isMatch(changedFile, matchers)) {
       core.debug(`   "any" patterns matched against ${changedFile}`);
       return true;
     }
@@ -99,7 +85,7 @@ export function checkAllChangedFiles(
 ): boolean {
   const matchers = globs.map(g => new Minimatch(g));
   for (const changedFile of changedFiles) {
-    if (!isAllMatch(changedFile, matchers)) {
+    if (!isMatch(changedFile, matchers)) {
       core.debug(`   "all" patterns did not match against ${changedFile}`);
       return false;
     }