fix: bug not using the path for source file inputs (#1179)
Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
		
							parent
							
								
									e82d3911ce
								
							
						
					
					
						commit
						c798a4ea57
					
				
							
								
								
									
										11
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -826,7 +826,8 @@ function run() { | ||||
|         } | ||||
|         core.info(`Retrieving changes between ${diffResult.previousSha} (${diffResult.targetBranch}) → ${diffResult.currentSha} (${diffResult.currentBranch})`); | ||||
|         const filePatterns = yield (0, utils_1.getFilePatterns)({ | ||||
|             inputs | ||||
|             inputs, | ||||
|             workingDirectory | ||||
|         }); | ||||
|         const addedFiles = yield (0, changedFiles_1.getDiffFiles)({ | ||||
|             inputs, | ||||
| @ -1607,7 +1608,7 @@ const jsonOutput = ({ value, shouldEscape }) => { | ||||
|     return shouldEscape ? result.replace(/"/g, '\\"') : result; | ||||
| }; | ||||
| 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 | ||||
|         .split(inputs.filesSeparator) | ||||
|         .filter(p => p !== '') | ||||
| @ -1615,7 +1616,8 @@ const getFilePatterns = ({ inputs }) => __awaiter(void 0, void 0, void 0, functi | ||||
|     if (inputs.filesFromSourceFile !== '') { | ||||
|         const inputFilesFromSourceFile = inputs.filesFromSourceFile | ||||
|             .split(inputs.filesFromSourceFileSeparator) | ||||
|             .filter(p => p !== ''); | ||||
|             .filter(p => p !== '') | ||||
|             .map(p => path.join(workingDirectory, p)); | ||||
|         core.debug(`files from source file: ${inputFilesFromSourceFile}`); | ||||
|         const filesFromSourceFiles = (yield getFilesFromSourceFile({ filePaths: inputFilesFromSourceFile })).join('\n'); | ||||
|         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) { | ||||
|         const inputFilesIgnoreFromSourceFile = inputs.filesIgnoreFromSourceFile | ||||
|             .split(inputs.filesIgnoreFromSourceFileSeparator) | ||||
|             .filter(p => p !== ''); | ||||
|             .filter(p => p !== '') | ||||
|             .map(p => path.join(workingDirectory, p)); | ||||
|         core.debug(`files ignore from source file: ${inputFilesIgnoreFromSourceFile}`); | ||||
|         const filesIgnoreFromSourceFiles = (yield getFilesFromSourceFile({ | ||||
|             filePaths: inputFilesIgnoreFromSourceFile, | ||||
|  | ||||
							
								
								
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -94,7 +94,8 @@ export async function run(): Promise<void> { | ||||
|   ) | ||||
| 
 | ||||
|   const filePatterns = await getFilePatterns({ | ||||
|     inputs | ||||
|     inputs, | ||||
|     workingDirectory | ||||
|   }) | ||||
| 
 | ||||
|   const addedFiles = await getDiffFiles({ | ||||
|  | ||||
| @ -676,9 +676,11 @@ export const jsonOutput = ({ | ||||
| } | ||||
| 
 | ||||
| export const getFilePatterns = async ({ | ||||
|   inputs | ||||
|   inputs, | ||||
|   workingDirectory | ||||
| }: { | ||||
|   inputs: Inputs | ||||
|   workingDirectory: string | ||||
| }): Promise<string[]> => { | ||||
|   let filePatterns = inputs.files | ||||
|     .split(inputs.filesSeparator) | ||||
| @ -689,6 +691,7 @@ export const getFilePatterns = async ({ | ||||
|     const inputFilesFromSourceFile = inputs.filesFromSourceFile | ||||
|       .split(inputs.filesFromSourceFileSeparator) | ||||
|       .filter(p => p !== '') | ||||
|       .map(p => path.join(workingDirectory, p)) | ||||
| 
 | ||||
|     core.debug(`files from source file: ${inputFilesFromSourceFile}`) | ||||
| 
 | ||||
| @ -722,6 +725,7 @@ export const getFilePatterns = async ({ | ||||
|     const inputFilesIgnoreFromSourceFile = inputs.filesIgnoreFromSourceFile | ||||
|       .split(inputs.filesIgnoreFromSourceFileSeparator) | ||||
|       .filter(p => p !== '') | ||||
|       .map(p => path.join(workingDirectory, p)) | ||||
| 
 | ||||
|     core.debug( | ||||
|       `files ignore from source file: ${inputFilesIgnoreFromSourceFile}` | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Tonye Jack
						Tonye Jack