Skip to content

Commit

Permalink
Remove unneeded commit information from build logs (#345)
Browse files Browse the repository at this point in the history
* Remove unneeded commit information from stdout
  • Loading branch information
thboop authored Sep 23, 2020
1 parent 21dc310 commit a81bbbf
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 9 deletions.
13 changes: 9 additions & 4 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5883,9 +5883,11 @@ class GitCommandManager {
yield this.execGit(['lfs', 'install', '--local']);
});
}
log1() {
log1(format) {
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;
});
}
Expand Down Expand Up @@ -6007,7 +6009,7 @@ class GitCommandManager {
return result;
});
}
execGit(args, allowAllExitCodes = false) {
execGit(args, allowAllExitCodes = false, silent = false) {
return __awaiter(this, void 0, void 0, function* () {
fshelper.directoryExistsSync(this.workingDirectory, true);
const result = new GitOutput();
Expand All @@ -6022,6 +6024,7 @@ class GitCommandManager {
const options = {
cwd: this.workingDirectory,
env,
silent,
ignoreReturnCode: allowAllExitCodes,
listeners: {
stdout: (data) => {
Expand Down Expand Up @@ -6267,8 +6270,10 @@ function getSource(settings) {
yield authHelper.removeGlobalAuth();
}
}
// Dump some info about the checked out commit
// Get commit information
const commitInfo = yield git.log1();
// Log commit sha
yield git.log1("--format='%H'");
// Check for incorrect pull request merge commit
yield refHelper.checkCommitInfo(settings.authToken, commitInfo, settings.repositoryOwner, settings.repositoryName, settings.ref, settings.commit);
}
Expand Down
12 changes: 8 additions & 4 deletions src/git-command-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface IGitCommandManager {
isDetached(): Promise<boolean>
lfsFetch(ref: string): Promise<void>
lfsInstall(): Promise<void>
log1(): Promise<string>
log1(format?: string): Promise<string>
remoteAdd(remoteName: string, remoteUrl: string): Promise<void>
removeEnvironmentVariable(name: string): void
revParse(ref: string): Promise<string>
Expand Down Expand Up @@ -254,8 +254,10 @@ class GitCommandManager {
await this.execGit(['lfs', 'install', '--local'])
}

async log1(): Promise<string> {
const output = await this.execGit(['log', '-1'])
async log1(format?: string): Promise<string> {
var args = format ? ['log', '-1', format] : ['log', '-1']
var silent = format ? false : true
const output = await this.execGit(args, false, silent)
return output.stdout
}

Expand Down Expand Up @@ -390,7 +392,8 @@ class GitCommandManager {

private async execGit(
args: string[],
allowAllExitCodes = false
allowAllExitCodes = false,
silent = false
): Promise<GitOutput> {
fshelper.directoryExistsSync(this.workingDirectory, true)

Expand All @@ -409,6 +412,7 @@ class GitCommandManager {
const options = {
cwd: this.workingDirectory,
env,
silent,
ignoreReturnCode: allowAllExitCodes,
listeners: {
stdout: (data: Buffer) => {
Expand Down
5 changes: 4 additions & 1 deletion src/git-source-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

// Log commit sha
await git.log1("--format='%H'")

// Check for incorrect pull request merge commit
await refHelper.checkCommitInfo(
settings.authToken,
Expand Down

0 comments on commit a81bbbf

Please sign in to comment.