Skip to content

Commit 350c530

Browse files
authored
Updated logs for GradleV3 task (#21140)
Updated logs for GradleV3 task to print a better output on execution failures.
1 parent 5838e56 commit 350c530

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Tasks/GradleV3/Modules/utils.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import { TaskResult } from 'azure-pipelines-task-lib';
44
/**
55
* Resolve task status based on code analysis run results
66
* @param {ICodeAnalysisResult} codeAnalysisResult - Code analysis run data
7+
* @param {string[]} inputTasks - List of tasks that were run
8+
* @param {string} inputOptions - Options passed to the Gradle command
79
* @returns {ITaskResult} task status and message
810
*/
9-
export function resolveTaskResult(codeAnalysisResult: ICodeAnalysisResult): ITaskResult {
11+
export function resolveTaskResult(codeAnalysisResult: ICodeAnalysisResult, inputTasks: string[], inputOptions:string): ITaskResult {
1012
let status: TaskResult;
1113
let message: string = '';
1214

@@ -17,7 +19,10 @@ export function resolveTaskResult(codeAnalysisResult: ICodeAnalysisResult): ITas
1719
status = TaskResult.Failed;
1820

1921
if (codeAnalysisResult.statusFailed) {
20-
message = `Code analysis failed. Gradle exit code: ${codeAnalysisResult.gradleResult}. Error: ${codeAnalysisResult.analysisError}`;
22+
message = `Gradle execution for task(s) ${inputTasks.join(', ')} failed with exit code ${codeAnalysisResult.gradleResult}.`;
23+
if(inputOptions != null && inputOptions !== ''){
24+
message = `Gradle execution for task(s) ${inputTasks.join(', ')} with options: ${inputOptions} failed with exit code ${codeAnalysisResult.gradleResult}.`;
25+
}
2126
} else {
2227
message = `Build failed. Gradle exit code: ${codeAnalysisResult.gradleResult}`;
2328
}

Tasks/GradleV3/gradletask.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async function run() {
3535
const testResultsFiles: string = tl.getInput('testResultsFiles', true);
3636
const inputTasks: string[] = tl.getDelimitedInput('tasks', ' ', true);
3737
const gradle5xOrHigher: boolean = tl.getBoolInput('gradle5xOrHigher');
38-
38+
const inputOptions:string = tl.getInput('options', false);
3939
const isCodeCoverageOpted: boolean = (typeof codeCoverageTool !== 'undefined' && codeCoverageTool && codeCoverageTool.toLowerCase() !== 'none');
4040
const buildOutput: BuildOutput = new BuildOutput(tl.getVariable('System.DefaultWorkingDirectory'), BuildEngine.Gradle);
4141

@@ -170,7 +170,7 @@ async function run() {
170170
};
171171
await publishCodeCoverageResultsAsync(publishCodeCoverageSettings);
172172

173-
const taskResult: ITaskResult = resolveTaskResult(codeAnalysisResult);
173+
const taskResult: ITaskResult = resolveTaskResult(codeAnalysisResult, inputTasks, inputOptions);
174174
tl.setResult(taskResult.status, taskResult.message);
175175
// END: Run code analysis
176176
} catch (err) {

Tasks/GradleV3/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 3,
19-
"Minor": 259,
19+
"Minor": 260,
2020
"Patch": 0
2121
},
2222
"releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",

Tasks/GradleV3/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 3,
19-
"Minor": 259,
19+
"Minor": 260,
2020
"Patch": 0
2121
},
2222
"releaseNotes": "ms-resource:loc.releaseNotes",

0 commit comments

Comments
 (0)