actions/changed-files
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: overwriting yaml filter patterns (#2307)

Browse Source 
Co-authored-by: tj-actions[bot] <109116665+tj-actions-bot@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
Tonye Jack 2024-10-03 06:48:13 -06:00 committed by GitHub
parent 27843f1667
commit c3a1bb2c99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dist/index.js generated vendored
View File

@ -2724,13 +2724,12 @@ const getYamlFilePatterns = async ({ inputs, workingDirectory }) => {
const newFilePatterns = await getYamlFilePatternsFromContents({ filePath }); const newFilePatterns = await getYamlFilePatternsFromContents({ filePath });
for (const key in newFilePatterns) { for (const key in newFilePatterns) {
if (key in filePatterns) { 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
};
} }
} }
if (inputs.filesIgnoreYaml) { if (inputs.filesIgnoreYaml) {
@ -2740,13 +2739,15 @@ const getYamlFilePatterns = async ({ inputs, workingDirectory }) => {
}); });
for (const key in newIgnoreFilePatterns) { for (const key in newIgnoreFilePatterns) {
if (key in filePatterns) { 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) { if (inputs.filesIgnoreYamlFromSourceFile) {
const inputFilesIgnoreYamlFromSourceFile = inputs.filesIgnoreYamlFromSourceFile const inputFilesIgnoreYamlFromSourceFile = inputs.filesIgnoreYamlFromSourceFile
@ -2761,13 +2762,15 @@ const getYamlFilePatterns = async ({ inputs, workingDirectory }) => {
}); });
for (const key in newIgnoreFilePatterns) { for (const key in newIgnoreFilePatterns) {
if (key in filePatterns) { 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
};
} }
} }
return filePatterns; return filePatterns;

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

38
src/utils.ts
View File

@ -1258,16 +1258,11 @@ export const getYamlFilePatterns = async ({
const newFilePatterns = await getYamlFilePatternsFromContents({filePath}) const newFilePatterns = await getYamlFilePatternsFromContents({filePath})
for (const key in newFilePatterns) { for (const key in newFilePatterns) {
if (key in filePatterns) { if (key in filePatterns) {
core.warning( filePatterns[key] = [...filePatterns[key], ...newFilePatterns[key]]
`files_yaml_from_source_file: Duplicated key ${key} detected in ${filePath}, the ${filePatterns[key]} will be overwritten by ${newFilePatterns[key]}.` } else {
) filePatterns[key] = newFilePatterns[key]
} }
} }
filePatterns = {
...filePatterns,
...newFilePatterns
}
} }
} }
@ -1279,15 +1274,14 @@ export const getYamlFilePatterns = async ({
for (const key in newIgnoreFilePatterns) { for (const key in newIgnoreFilePatterns) {
if (key in filePatterns) { if (key in filePatterns) {
core.warning( filePatterns[key] = [
`files_ignore_yaml: Duplicated key ${key} detected, the ${filePatterns[key]} will be overwritten by ${newIgnoreFilePatterns[key]}.` ...filePatterns[key],
) ...newIgnoreFilePatterns[key]
]
} else {
filePatterns[key] = newIgnoreFilePatterns[key]
} }
} }
filePatterns = {
...filePatterns,
...newIgnoreFilePatterns
}
} }
if (inputs.filesIgnoreYamlFromSourceFile) { if (inputs.filesIgnoreYamlFromSourceFile) {
@ -1309,16 +1303,14 @@ export const getYamlFilePatterns = async ({
for (const key in newIgnoreFilePatterns) { for (const key in newIgnoreFilePatterns) {
if (key in filePatterns) { if (key in filePatterns) {
core.warning( filePatterns[key] = [
`files_ignore_yaml_from_source_file: Duplicated key ${key} detected in ${filePath}, the ${filePatterns[key]} will be overwritten by ${newIgnoreFilePatterns[key]}.` ...filePatterns[key],
) ...newIgnoreFilePatterns[key]
]
} else {
filePatterns[key] = newIgnoreFilePatterns[key]
} }
} }
filePatterns = {
...filePatterns,
...newIgnoreFilePatterns
}
} }
} }