Skip to content

Commit 89719d4

Browse files
authored
Save the pull request number into pipeline result (Azure#21059)
1 parent fe15edd commit 89719d4

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.azure-pipelines/util/test-steps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ steps:
6767
displayName: 'Test for AutoGen Modules With PowerShell Core'
6868
condition: and(succeeded(), eq('${{ parameters.testTarget }}', 'Test'))
6969
continueOnError: true
70+
env:
71+
PowerShellPlatform: ${{ parameters.powerShellPlatform }}
7072

7173
- pwsh: |
7274
$PipelineResult = Get-Content PipelineResult.json | ConvertFrom-Json

build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<BuildAction Condition="'$(Configuration)' == 'Release'">publish</BuildAction>
199199
</PropertyGroup>
200200

201-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -Build -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -GenerateDocumentationFile $(GenerateDocumentationFile) -EnableTestCoverage $(TurnOnTestCoverage) -BuildAction $(BuildAction)&quot;" />
201+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -Build -PullRequestNumber $(PullRequestNumber) -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -GenerateDocumentationFile $(GenerateDocumentationFile) -EnableTestCoverage $(TurnOnTestCoverage) -BuildAction $(BuildAction)&quot;" />
202202

203203
<!-- Build version controller -->
204204
<Exec Command="dotnet build $(RepoTools)VersionController/VersionController.Netcore.csproj -c $(Configuration)" />

tools/ExecuteCIStep.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Param(
2323
[String]
2424
$BuildAction='build',
2525

26+
[String]
27+
$PullRequestNumber,
28+
2629
[String]
2730
$GenerateDocumentationFile,
2831

@@ -258,6 +261,7 @@ If ($Build)
258261
}
259262
$Template.$DependencyStep.Details += $Detail
260263
}
264+
$Template | Add-Member -NotePropertyName pull_request_number -NotePropertyValue $PullRequestNumber
261265

262266
ConvertTo-Json -Depth 10 -InputObject $Template | Out-File -FilePath "$RepoArtifacts/PipelineResult/PipelineResult.json"
263267
#EndRegion

tools/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Else {
3636
$Platform = "$($Env:PowerShellPlatform) - $OS"
3737
$Template = Get-Content "$ArtifactPipelineInfoFolder/PipelineResult.json" | ConvertFrom-Json
3838

39-
$DependencyStepList = $Template | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | Where-Object { $_ -Ne "build" -And $_ -Ne "test" }
39+
$DependencyStepList = $Template | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | Where-Object { $_ -Ne "build" -And $_ -Ne "test" -And $_ -Ne "pull_request_number" }
4040
ForEach ($Step In $DependencyStepList) {
4141
If ($Template.$Step.Details.Length -Ne 0) {
4242
$Template.$Step.Details[0] | Add-Member -NotePropertyName Platform -NotePropertyValue $Platform -Force
@@ -145,7 +145,7 @@ ForEach ($Step In $Steps) {
145145
$Content = "|Type|Cmdlet|Example|Line|RuleName|Description|Extent|Remediation|`n|---|---|---|---|---|---|---|---|`n"
146146
}
147147
ElseIf ($PhaseName -Eq "ux") {
148-
$Content = "|Type|Module|ResourceType|SubResourceType|Command|Description|Remediation|`n|---|---|---|---|---|---|---|`n"
148+
$Content = "|Type|Module|ResourceType|SubResourceType|Command|Description|`n|---|---|---|---|---|---|`n"
149149
}
150150
#EndRegion
151151

@@ -164,7 +164,7 @@ ForEach ($Step In $Steps) {
164164
$Content += "|$ErrorTypeEmoji|$($Issue.Target)|$($Issue.Example)|$($Issue.Line)|$($Issue.RuleName)|$($Issue.Description)|$($Issue.Extent)|$($Issue.Remediation)|`n"
165165
}
166166
ElseIf ($PhaseName -Eq "ux") {
167-
$Content = "|$ErrorTypeEmoji|$($Issue.Module)|$($Issue.ResourceType)|$($Issue.SubResourceType)|$($Issue.Command)|$($Issue.Description)|$($Issue.Remediation)|`n"
167+
$Content += "|$ErrorTypeEmoji|$($Issue.Module)|$($Issue.ResourceType)|$($Issue.SubResourceType)|$($Issue.Command)|$($Issue.Description)|`n"
168168
}
169169
#EndRegion
170170
}

0 commit comments

Comments
 (0)