Skip to content

Commit 531630d

Browse files
authored
Merge pull request #219 from tj-actions/fix/using-nested-file-patterns
fix: using nested paths with file patterns
2 parents 0215e26 + 213c4ee commit 531630d

3 files changed

Lines changed: 19 additions & 5 deletions

File tree

dist/index.js

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,25 @@ export async function run(): Promise<void> {
6868
core.getInput('working-directory', {required: true})
6969
)
7070

71-
let filePatterns = files.split(filesSeparator).join('\n')
71+
let filePatterns = files
72+
.split(filesSeparator)
73+
.filter(p => p !== '')
74+
.map(p => path.join(workingDirectory, p))
75+
.join('\n')
7276

7377
core.debug(`file patterns: ${filePatterns}`)
7478

7579
if (excludedFiles !== '') {
7680
const excludedFilePatterns = excludedFiles
7781
.split(excludedFilesSeparator)
82+
.filter(p => p !== '')
7883
.map(p => {
7984
if (!p.startsWith('!')) {
8085
p = `!${p}`
8186
}
8287
return p
8388
})
89+
.map(p => `!${path.join(workingDirectory, p.replace(/^!/, ''))}`)
8490
.join('\n')
8591

8692
core.debug(`excluded file patterns: ${excludedFilePatterns}`)
@@ -131,7 +137,9 @@ export async function run(): Promise<void> {
131137
}
132138
}
133139

134-
filePatterns += `\n${DEFAULT_EXCLUDED_FILES.join('\n')}`
140+
filePatterns += `\n${DEFAULT_EXCLUDED_FILES.map(
141+
p => `!${path.join(workingDirectory, p.replace(/^!/, ''))}`
142+
).join('\n')}`
135143

136144
const globOptions = {followSymbolicLinks}
137145
const globber = await glob.create(filePatterns, globOptions)

0 commit comments

Comments
 (0)