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

fix: bug not using the path for source file inputs (#1179)

Browse Source 
Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
Tonye Jack 2023-05-26 08:20:56 -06:00 committed by GitHub
parent e82d3911ce
commit c798a4ea57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/index.js generated vendored
View File

@ -826,7 +826,8 @@ function run() {
} }
core.info(`Retrieving changes between ${diffResult.previousSha} (${diffResult.targetBranch}) → ${diffResult.currentSha} (${diffResult.currentBranch})`); core.info(`Retrieving changes between ${diffResult.previousSha} (${diffResult.targetBranch}) → ${diffResult.currentSha} (${diffResult.currentBranch})`);
const filePatterns = yield (0, utils_1.getFilePatterns)({ const filePatterns = yield (0, utils_1.getFilePatterns)({
inputs inputs,
workingDirectory
}); });
const addedFiles = yield (0, changedFiles_1.getDiffFiles)({ const addedFiles = yield (0, changedFiles_1.getDiffFiles)({
inputs, inputs,
@ -1607,7 +1608,7 @@ const jsonOutput = ({ value, shouldEscape }) => {
return shouldEscape ? result.replace(/"/g, '\\"') : result; return shouldEscape ? result.replace(/"/g, '\\"') : result;
}; };
exports.jsonOutput = jsonOutput; exports.jsonOutput = jsonOutput;
const getFilePatterns = ({ inputs }) => __awaiter(void 0, void 0, void 0, function* () { const getFilePatterns = ({ inputs, workingDirectory }) => __awaiter(void 0, void 0, void 0, function* () {
let filePatterns = inputs.files let filePatterns = inputs.files
.split(inputs.filesSeparator) .split(inputs.filesSeparator)
.filter(p => p !== '') .filter(p => p !== '')
@ -1615,7 +1616,8 @@ const getFilePatterns = ({ inputs }) => __awaiter(void 0, void 0, void 0, functi
if (inputs.filesFromSourceFile !== '') { if (inputs.filesFromSourceFile !== '') {
const inputFilesFromSourceFile = inputs.filesFromSourceFile const inputFilesFromSourceFile = inputs.filesFromSourceFile
.split(inputs.filesFromSourceFileSeparator) .split(inputs.filesFromSourceFileSeparator)
.filter(p => p !== ''); .filter(p => p !== '')
.map(p => path.join(workingDirectory, p));
core.debug(`files from source file: ${inputFilesFromSourceFile}`); core.debug(`files from source file: ${inputFilesFromSourceFile}`);
const filesFromSourceFiles = (yield getFilesFromSourceFile({ filePaths: inputFilesFromSourceFile })).join('\n'); const filesFromSourceFiles = (yield getFilesFromSourceFile({ filePaths: inputFilesFromSourceFile })).join('\n');
core.debug(`files from source files patterns: ${filesFromSourceFiles}`); core.debug(`files from source files patterns: ${filesFromSourceFiles}`);
@ -1638,7 +1640,8 @@ const getFilePatterns = ({ inputs }) => __awaiter(void 0, void 0, void 0, functi
if (inputs.filesIgnoreFromSourceFile) { if (inputs.filesIgnoreFromSourceFile) {
const inputFilesIgnoreFromSourceFile = inputs.filesIgnoreFromSourceFile const inputFilesIgnoreFromSourceFile = inputs.filesIgnoreFromSourceFile
.split(inputs.filesIgnoreFromSourceFileSeparator) .split(inputs.filesIgnoreFromSourceFileSeparator)
.filter(p => p !== ''); .filter(p => p !== '')
.map(p => path.join(workingDirectory, p));
core.debug(`files ignore from source file: ${inputFilesIgnoreFromSourceFile}`); core.debug(`files ignore from source file: ${inputFilesIgnoreFromSourceFile}`);
const filesIgnoreFromSourceFiles = (yield getFilesFromSourceFile({ const filesIgnoreFromSourceFiles = (yield getFilesFromSourceFile({
filePaths: inputFilesIgnoreFromSourceFile, filePaths: inputFilesIgnoreFromSourceFile,

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

File diff suppressed because one or more lines are too long

3
src/main.ts
View File

@ -94,7 +94,8 @@ export async function run(): Promise<void> {
) )
const filePatterns = await getFilePatterns({ const filePatterns = await getFilePatterns({
inputs inputs,
workingDirectory
}) })
const addedFiles = await getDiffFiles({ const addedFiles = await getDiffFiles({

6
src/utils.ts
View File

@ -676,9 +676,11 @@ export const jsonOutput = ({
} }
export const getFilePatterns = async ({ export const getFilePatterns = async ({
inputs inputs,
workingDirectory
}: { }: {
inputs: Inputs inputs: Inputs
workingDirectory: string
}): Promise<string[]> => { }): Promise<string[]> => {
let filePatterns = inputs.files let filePatterns = inputs.files
.split(inputs.filesSeparator) .split(inputs.filesSeparator)
@ -689,6 +691,7 @@ export const getFilePatterns = async ({
const inputFilesFromSourceFile = inputs.filesFromSourceFile const inputFilesFromSourceFile = inputs.filesFromSourceFile
.split(inputs.filesFromSourceFileSeparator) .split(inputs.filesFromSourceFileSeparator)
.filter(p => p !== '') .filter(p => p !== '')
.map(p => path.join(workingDirectory, p))
core.debug(`files from source file: ${inputFilesFromSourceFile}`) core.debug(`files from source file: ${inputFilesFromSourceFile}`)
@ -722,6 +725,7 @@ export const getFilePatterns = async ({
const inputFilesIgnoreFromSourceFile = inputs.filesIgnoreFromSourceFile const inputFilesIgnoreFromSourceFile = inputs.filesIgnoreFromSourceFile
.split(inputs.filesIgnoreFromSourceFileSeparator) .split(inputs.filesIgnoreFromSourceFileSeparator)
.filter(p => p !== '') .filter(p => p !== '')
.map(p => path.join(workingDirectory, p))
core.debug( core.debug(
`files ignore from source file: ${inputFilesIgnoreFromSourceFile}` `files ignore from source file: ${inputFilesIgnoreFromSourceFile}`