fix: overwriting yaml filter patterns (#2307)

Co-authored-by: tj-actions[bot] <[email protected]> Co-authored-by: GitHub Action <[email protected]>
tj-actions · Oct 3, 2024 · c3a1bb2 · c3a1bb2
1 parent 27843f1
commit c3a1bb2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 39 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/utils.ts b/src/utils.ts
@@ -1258,16 +1258,11 @@ export const getYamlFilePatterns = async ({
       const newFilePatterns = await getYamlFilePatternsFromContents({filePath})
       for (const key in newFilePatterns) {
         if (key in filePatterns) {
-          core.warning(
-            `files_yaml_from_source_file: Duplicated key ${key} detected in ${filePath}, the ${filePatterns[key]} will be overwritten by ${newFilePatterns[key]}.`
-          )
+          filePatterns[key] = [...filePatterns[key], ...newFilePatterns[key]]
+        } else {
+          filePatterns[key] = newFilePatterns[key]
         }
       }
-
-      filePatterns = {
-        ...filePatterns,
-        ...newFilePatterns
-      }
     }
   }
 
@@ -1279,15 +1274,14 @@ export const getYamlFilePatterns = async ({
 
     for (const key in newIgnoreFilePatterns) {
       if (key in filePatterns) {
-        core.warning(
-          `files_ignore_yaml: Duplicated key ${key} detected, the ${filePatterns[key]} will be overwritten by ${newIgnoreFilePatterns[key]}.`
-        )
+        filePatterns[key] = [
+          ...filePatterns[key],
+          ...newIgnoreFilePatterns[key]
+        ]
+      } else {
+        filePatterns[key] = newIgnoreFilePatterns[key]
       }
     }
-    filePatterns = {
-      ...filePatterns,
-      ...newIgnoreFilePatterns
-    }
   }
 
   if (inputs.filesIgnoreYamlFromSourceFile) {
@@ -1309,16 +1303,14 @@ export const getYamlFilePatterns = async ({
 
       for (const key in newIgnoreFilePatterns) {
         if (key in filePatterns) {
-          core.warning(
-            `files_ignore_yaml_from_source_file: Duplicated key ${key} detected in ${filePath}, the ${filePatterns[key]} will be overwritten by ${newIgnoreFilePatterns[key]}.`
-          )
+          filePatterns[key] = [
+            ...filePatterns[key],
+            ...newIgnoreFilePatterns[key]
+          ]
+        } else {
+          filePatterns[key] = newIgnoreFilePatterns[key]
         }
       }
-
-      filePatterns = {
-        ...filePatterns,
-        ...newIgnoreFilePatterns
-      }
     }
   }