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

fix vcpkg output (#2319)

Browse Source
This commit is contained in:
Dibir Magomedsaygitov
2020-12-24 10:17:19 +03:00
committed by GitHub
parent 7403f33180
commit 6245d40db7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -138,7 +138,7 @@ function Get-VcpkgVersion {
$result.Output -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null $result.Output -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
$vcpkgVersion = $Matches.version $vcpkgVersion = $Matches.version
$commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD
return "Vcpkg $vcpkgVersion (build from master <$commitId>)" return "Vcpkg $vcpkgVersion (build from master \<$commitId>)"
} }
function Get-AntVersion { function Get-AntVersion {

2
images/macos/software-report/SoftwareReport.Common.psm1
View File

@@ -57,7 +57,7 @@ function Get-RustupVersion {
function Get-VcpkgVersion { function Get-VcpkgVersion {
$vcpkgVersion = Run-Command "vcpkg version" | Select-Object -First 1 | Take-Part -Part 5 | Take-Part -Part 0 -Delimiter "-" $vcpkgVersion = Run-Command "vcpkg version" | Select-Object -First 1 | Take-Part -Part 5 | Take-Part -Part 0 -Delimiter "-"
$commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD
return "Vcpkg $vcpkgVersion (build from master <$commitId>)" return "Vcpkg $vcpkgVersion (build from master \<$commitId>)"
} }
function Get-GccVersion { function Get-GccVersion {

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

@@ -109,7 +109,7 @@ function Get-VcpkgVersion {
($(vcpkg version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null ($(vcpkg version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
$vcpkgVersion = $Matches.Version $vcpkgVersion = $Matches.Version
$commitId = git -C "C:\vcpkg" rev-parse --short HEAD $commitId = git -C "C:\vcpkg" rev-parse --short HEAD
return "Vcpkg $vcpkgVersion (build from master <$commitId>)" return "Vcpkg $vcpkgVersion (build from master \<$commitId>)"
} }
function Get-NPMVersion { function Get-NPMVersion {