fix: bug with order in which the files and files ignore patterns are …

…combined (#1684) Co-authored-by: GitHub Action <action@github.com>
tj-actions · Oct 30, 2023 · 7549e1e · 7549e1e
1 parent 2fc653d
commit 7549e1e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 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
@@ -938,27 +938,7 @@ export const getFilePatterns = async ({
   inputs: Inputs
   workingDirectory: string
 }): Promise<string[]> => {
-  let filePatterns = inputs.files
-    .split(inputs.filesSeparator)
-    .filter(Boolean)
-    .join('\n')
-
-  if (inputs.filesFromSourceFile !== '') {
-    const inputFilesFromSourceFile = inputs.filesFromSourceFile
-      .split(inputs.filesFromSourceFileSeparator)
-      .filter(p => p !== '')
-      .map(p => path.join(workingDirectory, p))
-
-    core.debug(`files from source file: ${inputFilesFromSourceFile}`)
-
-    const filesFromSourceFiles = (
-      await getFilesFromSourceFile({filePaths: inputFilesFromSourceFile})
-    ).join('\n')
-
-    core.debug(`files from source files patterns: ${filesFromSourceFiles}`)
-
-    filePatterns = filePatterns.concat('\n', filesFromSourceFiles)
-  }
+  let filePatterns = ''
 
   if (inputs.filesIgnore) {
     const filesIgnorePatterns = inputs.filesIgnore
@@ -1001,6 +981,30 @@ export const getFilePatterns = async ({
     filePatterns = filePatterns.concat('\n', filesIgnoreFromSourceFiles)
   }
 
+  if (inputs.files) {
+    filePatterns = filePatterns.concat(
+      '\n',
+      inputs.files.split(inputs.filesSeparator).filter(Boolean).join('\n')
+    )
+  }
+
+  if (inputs.filesFromSourceFile !== '') {
+    const inputFilesFromSourceFile = inputs.filesFromSourceFile
+      .split(inputs.filesFromSourceFileSeparator)
+      .filter(p => p !== '')
+      .map(p => path.join(workingDirectory, p))
+
+    core.debug(`files from source file: ${inputFilesFromSourceFile}`)
+
+    const filesFromSourceFiles = (
+      await getFilesFromSourceFile({filePaths: inputFilesFromSourceFile})
+    ).join('\n')
+
+    core.debug(`files from source files patterns: ${filesFromSourceFiles}`)
+
+    filePatterns = filePatterns.concat('\n', filesFromSourceFiles)
+  }
+
   if (isWindows()) {
     filePatterns = filePatterns.replace(/\r\n/g, '\n')
     filePatterns = filePatterns.replace(/\r/g, '\n')