mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Also generate a non-graphViz graph (#878)

Browse source 
* Also generate a non-graphViz graph

* Rename file in yml
This commit is contained in:
JC Aguilera 2019-03-06 17:13:43 -08:00 committed by Nick Guerrera
parent 9b1b0577e3
commit fd6bc33995
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.vsts-ci.yml
View file

@ -297,13 +297,13 @@ jobs:
- task: PowerShell@2 - task: PowerShell@2
displayName: Generate GraphViz graph displayName: Generate GraphViz graph
inputs: inputs:
filePath: eng/common/generate-graphviz.ps1 filePath: eng/common/generate-graph-files.ps1
arguments: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) -barToken $(MaestroAccessToken) -outputFolder '$(Build.StagingDirectory)/GraphViz/' arguments: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) -barToken $(MaestroAccessToken) -outputFolder '$(Build.StagingDirectory)/GraphViz/'
continueOnError: true continueOnError: true
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: Publish Graph to Artifacts displayName: Publish Graph to Artifacts
inputs: inputs:
PathtoPublish: '$(Build.StagingDirectory)/GraphViz' PathtoPublish: '$(Build.StagingDirectory)/GraphFiles'
PublishLocation: Container PublishLocation: Container
ArtifactName: GraphViz ArtifactName: GraphViz
continueOnError: true continueOnError: true

7
eng/common/generate-graphviz.ps1 → eng/common/generate-graph-files.ps1
View file

@ -3,7 +3,7 @@ Param(
[Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed) [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
[Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed) [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
[Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created
[string] $darcVersion = '1.1.0-beta.19154.2', # darc's version [string] $darcVersion = '1.1.0-beta.19156.4', # darc's version
[switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
# toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
) )
@ -33,7 +33,8 @@ try {
Create-Directory $outputFolder Create-Directory $outputFolder
$graphVizFilePath = "$outputFolder\graphviz.txt" $graphVizFilePath = "$outputFolder\graphviz.txt"
$options = "get-dependency-graph --graphviz '$graphVizFilePath' --github-pat $gitHubPat --azdev-pat $azdoPat --password $barToken" $graphFilePath = "$outputFolder\graph.txt"
$options = "get-dependency-graph --graphviz '$graphVizFilePath' --github-pat $gitHubPat --azdev-pat $azdoPat --password $barToken --output-file $graphFilePath"
if ($includeToolset) { if ($includeToolset) {
Write-Host "Toolsets will be included in the graph..." Write-Host "Toolsets will be included in the graph..."
@ -46,7 +47,7 @@ try {
$graph = Get-Content $graphVizFilePath $graph = Get-Content $graphVizFilePath
Set-Content $graphVizFilePath -Value "Paste the following digraph object in http://www.webgraphviz.com `r`n", $graph Set-Content $graphVizFilePath -Value "Paste the following digraph object in http://www.webgraphviz.com `r`n", $graph
Write-Host "'$graphVizFilePath' file created!" Write-Host "'$graphVizFilePath' and '$graphFilePath' created!"
} }
catch { catch {
if (!$includeToolset) { if (!$includeToolset) {