actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-14 13:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Fix markdown in the software report (#4587)

Browse Source
This commit is contained in:
V-Zabayrachny
2021-12-03 00:33:38 +03:00
committed by GitHub
parent ca8169d472
commit d12aeab69c
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -310,7 +310,7 @@ function Get-PacmanVersion {
$rawVersion = & $pacmanPath --version $rawVersion = & $pacmanPath --version
$rawVersion.Split([System.Environment]::NewLine)[1] -match "\d+\.\d+(\.\d+)?" | Out-Null $rawVersion.Split([System.Environment]::NewLine)[1] -match "\d+\.\d+(\.\d+)?" | Out-Null
$pacmanVersion = $matches[0] $pacmanVersion = $matches[0]
return "- Pacman $pacmanVersion" return "Pacman $pacmanVersion"
} }
function Get-YAMLLintVersion { function Get-YAMLLintVersion {
@@ -319,7 +319,7 @@ function Get-YAMLLintVersion {
function Get-BizTalkVersion { function Get-BizTalkVersion {
$bizTalkReg = Get-ItemProperty "HKLM:\SOFTWARE\WOW6432Node\Microsoft\BizTalk Server\3.0" $bizTalkReg = Get-ItemProperty "HKLM:\SOFTWARE\WOW6432Node\Microsoft\BizTalk Server\3.0"
return "- $($bizTalkReg.ProductName) $($bizTalkReg.ProductVersion) " return "$($bizTalkReg.ProductName) $($bizTalkReg.ProductVersion)"
} }
function Get-PipxVersion { function Get-PipxVersion {

20
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -189,32 +189,28 @@ $markdown += Get-ShellTarget
$markdown += New-MDNewLine $markdown += New-MDNewLine
$markdown += New-MDHeader "MSYS2" -Level 3 $markdown += New-MDHeader "MSYS2" -Level 3
$markdown += Get-PacmanVersion $markdown += "$(Get-PacmanVersion)" | New-MDList -Style Unordered
$markdown += New-MDNewLine
$markdown += New-MDHeader "Notes:" -Level 5 $markdown += New-MDHeader "Notes:" -Level 5
$markdown += @' $reportMsys64 = @'
``` ```
Location: C:\msys64 Location: C:\msys64
Note: MSYS2 is pre-installed on image but not added to PATH. Note: MSYS2 is pre-installed on image but not added to PATH.
``` ```
'@ '@
$markdown += New-MDNewLine $markdown += New-MDParagraph -Lines $reportMsys64
if (Test-IsWin19) if (Test-IsWin19)
{ {
$markdown += New-MDHeader "BizTalk Server" -Level 3 $markdown += New-MDHeader "BizTalk Server" -Level 3
$markdown += Get-BizTalkVersion $markdown += "$(Get-BizTalkVersion)" | New-MDList -Style Unordered
$markdown += New-MDNewLine
} }
$markdown += New-MDHeader "Cached Tools" -Level 3 $markdown += New-MDHeader "Cached Tools" -Level 3
$markdown += (Build-CachedToolsMarkdown) $markdown += (Build-CachedToolsMarkdown)
$markdown += New-MDNewLine
$markdown += New-MDHeader "Databases" -Level 3 $markdown += New-MDHeader "Databases" -Level 3
$markdown += Build-DatabasesMarkdown $markdown += Build-DatabasesMarkdown
$markdown += New-MDNewLine
$markdown += New-MDHeader "Database tools" -Level 3 $markdown += New-MDHeader "Database tools" -Level 3
$markdown += New-MDList -Style Unordered -Lines (@( $markdown += New-MDList -Style Unordered -Lines (@(
@@ -224,7 +220,6 @@ $markdown += New-MDList -Style Unordered -Lines (@(
(Get-SQLPSVersion) (Get-SQLPSVersion)
) | Sort-Object ) | Sort-Object
) )
$markdown += New-MDNewLine
$markdown += Build-WebServersSection $markdown += Build-WebServersSection
@@ -234,12 +229,10 @@ $markdown += $vs | New-MDTable
$markdown += New-MDNewLine $markdown += New-MDNewLine
$markdown += New-MDHeader "Workloads, components and extensions:" -Level 4 $markdown += New-MDHeader "Workloads, components and extensions:" -Level 4
$markdown += New-MDNewLine
$markdown += ((Get-VisualStudioComponents) + (Get-VisualStudioExtensions)) | New-MDTable $markdown += ((Get-VisualStudioComponents) + (Get-VisualStudioExtensions)) | New-MDTable
$markdown += New-MDNewLine $markdown += New-MDNewLine
$markdown += New-MDHeader "Microsoft Visual C++:" -Level 4 $markdown += New-MDHeader "Microsoft Visual C++:" -Level 4
$markdown += New-MDNewLine
$markdown += Get-VisualCPPComponents | New-MDTable $markdown += Get-VisualCPPComponents | New-MDTable
$markdown += New-MDNewLine $markdown += New-MDNewLine
@@ -272,14 +265,14 @@ $markdown += New-MDList -Lines (Get-PowershellCoreVersion) -Style Unordered
$markdown += New-MDHeader "Azure Powershell Modules" -Level 4 $markdown += New-MDHeader "Azure Powershell Modules" -Level 4
$markdown += Get-PowerShellAzureModules | New-MDTable $markdown += Get-PowerShellAzureModules | New-MDTable
$markdown += @' $reportAzPwsh = @'
``` ```
Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed
and are available via 'Get-Module -ListAvailable'. and are available via 'Get-Module -ListAvailable'.
All other versions are saved but not installed. All other versions are saved but not installed.
``` ```
'@ '@
$markdown += New-MDNewLine $markdown += New-MDParagraph -Lines $reportAzPwsh
$markdown += New-MDHeader "Powershell Modules" -Level 4 $markdown += New-MDHeader "Powershell Modules" -Level 4
$markdown += Get-PowerShellModules | New-MDTable $markdown += Get-PowerShellModules | New-MDTable
@@ -298,7 +291,6 @@ $cachedImages = Get-CachedDockerImagesTableData
if ($cachedImages) { if ($cachedImages) {
$markdown += New-MDHeader "Cached Docker images" -Level 3 $markdown += New-MDHeader "Cached Docker images" -Level 3
$markdown += $cachedImages | New-MDTable $markdown += $cachedImages | New-MDTable
$markdown += New-MDNewLine
} }
$markdown | Out-File -FilePath "C:\InstalledSoftware.md" $markdown | Out-File -FilePath "C:\InstalledSoftware.md"

2
images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
View File

@@ -21,7 +21,7 @@ function Build-MarkdownElement
) )
$markdown = New-MDHeader $Head -Level 4 $markdown = New-MDHeader $Head -Level 4
$markdown += New-MDParagraph -Lines $Content $markdown += New-MDParagraph -Lines $Content -NoNewLine
return $markdown return $markdown
} }