Skip to content

Update logic of generate pipeline result #20651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isra-fel merged 1 commit into from
Jan 16, 2023
Merged

Update logic of generate pipeline result #20651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/ExecuteCIStep.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,12 @@ If ($Build)
{
$ModuleInfoList += @{
Module = "Az.$ModuleName";
Status = $DependencyStepStatus;
Status = "Running";
Content = "";
}
}
$Detail = @{
Platform = $Platform;
Modules = $ModuleInfoList;
}
$Template.$DependencyStep.Details += $Detail
Expand Down
14 changes: 7 additions & 7 deletions tools/PipelineResultTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{
"build": {
"Name": "Build",
"PhaseName": "Build",
"Order": 1,
"Details": [
]
},
"breaking-change": {
"Name": "Breaking Change Check",
"PhaseName": "Breaking Change Check",
"Order": 2,
"Details": [
]
},
"signature": {
"Name": "Signature Check",
"PhaseName": "Signature Check",
"Order": 3,
"Details": [
]
},
"help-example": {
"Name": "Help Example Check",
"PhaseName": "Help Example Check",
"Order": 4,
"Details": [
]
},
"help": {
"Name": "Help File Existence Check",
"PhaseName": "Help File Existence Check",
"Order": 5,
"Details": [
]
},
"file-change": {
"Name": "File Change Check",
"PhaseName": "File Change Check",
"Order": 6,
"Details": [
]
},
"test": {
"Name": "Test",
"PhaseName": "Test",
"Order": 100,
"Details": [
]
Expand Down
22 changes: 11 additions & 11 deletions tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,32 @@ ForEach ($Step In $DependencyStepList)

$Steps = @(
@{
StepName = "breaking-change"
PhaseName = "breaking-change"
IssuePath = "$StaticAnalysisOutputDirectory/BreakingChangeIssues.csv"
},
@{
StepName = "help"
PhaseName = "help"
IssuePath = "$StaticAnalysisOutputDirectory/HelpIssues.csv"
},
@{
StepName = "help-example"
PhaseName = "help-example"
IssuePath = "$StaticAnalysisOutputDirectory/ExampleIssues.csv"
},
@{
StepName = "signature"
PhaseName = "signature"
IssuePath = "$StaticAnalysisOutputDirectory/SignatureIssues.csv"
},
@{
StepName = "file-change"
PhaseName = "file-change"
IssuePath = "$StaticAnalysisOutputDirectory/FileChangeIssue.csv"
}
)

ForEach ($Step In $Steps)
{
$StepName = $Step.StepName
$PhaseName = $Step.PhaseName
$IssuePath = $Step.IssuePath
$Details = $Template.$StepName.Details
$Details = $Template.$PhaseName.Details
If ($Details.Length -Ne 0)
{
$Details = $Details[0]
Expand Down Expand Up @@ -115,11 +115,11 @@ ForEach ($Step In $Steps)
{
#Region generate table head of each step
$NormalSteps = [System.Collections.Generic.HashSet[String]]@("breaking-change", "help", "signature", "file-change")
If ($NormalSteps.Contains($StepName))
If ($NormalSteps.Contains($PhaseName))
{
$Content = "|Type|Cmdlet|Description|Remediation|`n|---|---|---|---|`n"
}
ElseIf ($StepName -Eq "help-example")
ElseIf ($PhaseName -Eq "help-example")
{
$Content = "|Type|Cmdlet|Example|Line|RuleName|Description|Extent|Remediation|`n|---|---|---|---|---|---|---|---|`n"
}
Expand All @@ -136,11 +136,11 @@ ForEach ($Step In $Steps)
$ErrorTypeEmoji = "⚠️"
}
#Region generate table content of each step
If ($NormalSteps.Contains($StepName))
If ($NormalSteps.Contains($PhaseName))
{
$Content += "|$ErrorTypeEmoji|$($Issue.Target)|$($Issue.Description)|$($Issue.Remediation)|`n"
}
ElseIf ($StepName -Eq "help-example")
ElseIf ($PhaseName -Eq "help-example")
{
$Content += "|$ErrorTypeEmoji|$($Issue.Target)|$($Issue.Example)|$($Issue.Line)|$($Issue.RuleName)|$($Issue.Description)|$($Issue.Extent)|$($Issue.Remediation)|`n"
}
Expand Down