Skip to content

Commit 4036a60

Browse files
authored
update some steps in collect CI result (#20459)
1 parent 16153bb commit 4036a60

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

tools/ExecuteCIStep.ps1

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,28 +132,38 @@ If ($Build)
132132
{
133133
$ModuleBuildInfoList += @{
134134
Module = "Az.$ModuleName";
135-
Status = "Success";
135+
Status = "Succeeded";
136136
Content = "";
137137
}
138138
}
139139
Else
140140
{
141141
$Content = "|Type|Code|Position|Detail|`n|---|---|---|---|`n"
142+
$ErrorCount = 0
142143
ForEach ($BuildResult In $BuildResultOfModule)
143144
{
144145
If ($BuildResult.Type -Eq "Error")
145146
{
146147
$ErrorTypeEmoji = ""
148+
$ErrorCount += 1
147149
}
148150
ElseIf ($BuildResult.Type -Eq "Warning")
149151
{
150152
$ErrorTypeEmoji = "⚠️"
151153
}
152154
$Content += "|$ErrorTypeEmoji|$($BuildResult.Code)|$($BuildResult.Position)|$($BuildResult.Detail)|`n"
153155
}
156+
If ($ErrorCount -Eq 0)
157+
{
158+
$Status = "Warning"
159+
}
160+
Else
161+
{
162+
$Status = "Failed"
163+
}
154164
$ModuleBuildInfoList += @{
155165
Module = "Az.$ModuleName";
156-
Status = "Failed";
166+
Status = $Status;
157167
Content = $Content;
158168
}
159169
}
@@ -162,16 +172,6 @@ If ($Build)
162172
Platform = $Platform;
163173
Modules = $ModuleBuildInfoList;
164174
}
165-
If ($BuildResultArray.Length -Ne 0)
166-
{
167-
$BuildDetail.Status = "Failed"
168-
$DependencyStepStatus = "Canceled"
169-
}
170-
Else
171-
{
172-
$BuildDetail.Status = "Success"
173-
$DependencyStepStatus = "Running"
174-
}
175175
$Template.Build.Details += $BuildDetail
176176

177177
$DependencyStepList = $Template | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | Where-Object { $_ -Ne "build" }
@@ -188,7 +188,6 @@ If ($Build)
188188
}
189189
}
190190
$Detail = @{
191-
Status = $DependencyStepStatus;
192191
Modules = $ModuleInfoList;
193192
}
194193
$Template.$DependencyStep.Details += $Detail

tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,17 @@ ForEach ($Step In $Steps)
9393
$ModuleName = $ModuleInfo.Module
9494

9595
$ErrorIssues = $Issues | Where-Object { $_.Module -Eq $ModuleName -And $_.Severity -Lt 2 }
96+
$WaringIssues = $Issues | Where-Object { $_.Module -Eq $ModuleName -And $_.Severity -Ge 2 }
9697
If ($ErrorIssues.Length -Eq 0)
9798
{
98-
$ModuleInfo.Status = "Success"
99+
If ($WaringIssues.Length -Eq 0)
100+
{
101+
$ModuleInfo.Status = "Succeeded"
102+
}
103+
Else
104+
{
105+
$ModuleInfo.Status = "Warning"
106+
}
99107
}
100108
Else
101109
{
@@ -141,15 +149,6 @@ ForEach ($Step In $Steps)
141149
$ModuleInfo.Content = $Content
142150
}
143151
}
144-
145-
If (($Issues | Where-Object { $_.Severity -Lt 2 }).Length -Eq 0)
146-
{
147-
$Details.Status = "Success"
148-
}
149-
Else
150-
{
151-
$Details.Status = "Failed"
152-
}
153152
}
154153
}
155154

0 commit comments

Comments
 (0)