mirror of
				https://github.com/actions/checkout.git
				synced 2025-10-31 01:58:36 +08:00 
			
		
		
		
	Remove unneeded commit information from build logs (#345)
* Remove unneeded commit information from stdout
This commit is contained in:
		
							parent
							
								
									21dc310f19
								
							
						
					
					
						commit
						a81bbbf829
					
				
							
								
								
									
										13
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							|  | @ -5883,9 +5883,11 @@ class GitCommandManager { | ||||||
|             yield this.execGit(['lfs', 'install', '--local']); |             yield this.execGit(['lfs', 'install', '--local']); | ||||||
|         }); |         }); | ||||||
|     } |     } | ||||||
|     log1() { |     log1(format) { | ||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             const output = yield this.execGit(['log', '-1']); |             var args = format ? ['log', '-1', format] : ['log', '-1']; | ||||||
|  |             var silent = format ? false : true; | ||||||
|  |             const output = yield this.execGit(args, false, silent); | ||||||
|             return output.stdout; |             return output.stdout; | ||||||
|         }); |         }); | ||||||
|     } |     } | ||||||
|  | @ -6007,7 +6009,7 @@ class GitCommandManager { | ||||||
|             return result; |             return result; | ||||||
|         }); |         }); | ||||||
|     } |     } | ||||||
|     execGit(args, allowAllExitCodes = false) { |     execGit(args, allowAllExitCodes = false, silent = false) { | ||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             fshelper.directoryExistsSync(this.workingDirectory, true); |             fshelper.directoryExistsSync(this.workingDirectory, true); | ||||||
|             const result = new GitOutput(); |             const result = new GitOutput(); | ||||||
|  | @ -6022,6 +6024,7 @@ class GitCommandManager { | ||||||
|             const options = { |             const options = { | ||||||
|                 cwd: this.workingDirectory, |                 cwd: this.workingDirectory, | ||||||
|                 env, |                 env, | ||||||
|  |                 silent, | ||||||
|                 ignoreReturnCode: allowAllExitCodes, |                 ignoreReturnCode: allowAllExitCodes, | ||||||
|                 listeners: { |                 listeners: { | ||||||
|                     stdout: (data) => { |                     stdout: (data) => { | ||||||
|  | @ -6267,8 +6270,10 @@ function getSource(settings) { | ||||||
|                     yield authHelper.removeGlobalAuth(); |                     yield authHelper.removeGlobalAuth(); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|             // Dump some info about the checked out commit
 |             // Get commit information
 | ||||||
|             const commitInfo = yield git.log1(); |             const commitInfo = yield git.log1(); | ||||||
|  |             // Log commit sha
 | ||||||
|  |             yield git.log1("--format='%H'"); | ||||||
|             // Check for incorrect pull request merge commit
 |             // Check for incorrect pull request merge commit
 | ||||||
|             yield refHelper.checkCommitInfo(settings.authToken, commitInfo, settings.repositoryOwner, settings.repositoryName, settings.ref, settings.commit); |             yield refHelper.checkCommitInfo(settings.authToken, commitInfo, settings.repositoryOwner, settings.repositoryName, settings.ref, settings.commit); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -31,7 +31,7 @@ export interface IGitCommandManager { | ||||||
|   isDetached(): Promise<boolean> |   isDetached(): Promise<boolean> | ||||||
|   lfsFetch(ref: string): Promise<void> |   lfsFetch(ref: string): Promise<void> | ||||||
|   lfsInstall(): Promise<void> |   lfsInstall(): Promise<void> | ||||||
|   log1(): Promise<string> |   log1(format?: string): Promise<string> | ||||||
|   remoteAdd(remoteName: string, remoteUrl: string): Promise<void> |   remoteAdd(remoteName: string, remoteUrl: string): Promise<void> | ||||||
|   removeEnvironmentVariable(name: string): void |   removeEnvironmentVariable(name: string): void | ||||||
|   revParse(ref: string): Promise<string> |   revParse(ref: string): Promise<string> | ||||||
|  | @ -254,8 +254,10 @@ class GitCommandManager { | ||||||
|     await this.execGit(['lfs', 'install', '--local']) |     await this.execGit(['lfs', 'install', '--local']) | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   async log1(): Promise<string> { |   async log1(format?: string): Promise<string> { | ||||||
|     const output = await this.execGit(['log', '-1']) |     var args = format ? ['log', '-1', format] : ['log', '-1'] | ||||||
|  |     var silent = format ? false : true | ||||||
|  |     const output = await this.execGit(args, false, silent) | ||||||
|     return output.stdout |     return output.stdout | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|  | @ -390,7 +392,8 @@ class GitCommandManager { | ||||||
| 
 | 
 | ||||||
|   private async execGit( |   private async execGit( | ||||||
|     args: string[], |     args: string[], | ||||||
|     allowAllExitCodes = false |     allowAllExitCodes = false, | ||||||
|  |     silent = false | ||||||
|   ): Promise<GitOutput> { |   ): Promise<GitOutput> { | ||||||
|     fshelper.directoryExistsSync(this.workingDirectory, true) |     fshelper.directoryExistsSync(this.workingDirectory, true) | ||||||
| 
 | 
 | ||||||
|  | @ -409,6 +412,7 @@ class GitCommandManager { | ||||||
|     const options = { |     const options = { | ||||||
|       cwd: this.workingDirectory, |       cwd: this.workingDirectory, | ||||||
|       env, |       env, | ||||||
|  |       silent, | ||||||
|       ignoreReturnCode: allowAllExitCodes, |       ignoreReturnCode: allowAllExitCodes, | ||||||
|       listeners: { |       listeners: { | ||||||
|         stdout: (data: Buffer) => { |         stdout: (data: Buffer) => { | ||||||
|  |  | ||||||
|  | @ -201,9 +201,12 @@ export async function getSource(settings: IGitSourceSettings): Promise<void> { | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     // Dump some info about the checked out commit
 |     // Get commit information
 | ||||||
|     const commitInfo = await git.log1() |     const commitInfo = await git.log1() | ||||||
| 
 | 
 | ||||||
|  |     // Log commit sha
 | ||||||
|  |     await git.log1("--format='%H'") | ||||||
|  | 
 | ||||||
|     // Check for incorrect pull request merge commit
 |     // Check for incorrect pull request merge commit
 | ||||||
|     await refHelper.checkCommitInfo( |     await refHelper.checkCommitInfo( | ||||||
|       settings.authToken, |       settings.authToken, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Thomas Boop
						Thomas Boop