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] Stop SoftwareReport script if error (#4801)

Browse Source 
* Stop SoftwareReport script if error

* Validate blank versions

* Fix tables parsing
This commit is contained in:
Aleksandr Chebotov
2021-12-24 10:58:19 +03:00
committed by GitHub
parent d4793cf476
commit 7518d04a3a
4 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,28 +26,29 @@ function Get-RustVersion {
}
function Get-RustupVersion {
$version = [regex]::matches($(rustup --version), "\d+\.\d+\.\d+").Value
return $version
$rustupInfo = cmd /c "rustup --version 2>NUL"
$version = [regex]::matches($rustupInfo, "\d+\.\d+\.\d+").Value
return $version
}
function Get-RustCargoVersion {
$version = [regex]::matches($(cargo --version), "\d+\.\d+\.\d+").Value
return $version
$version = [regex]::matches($(cargo --version), "\d+\.\d+\.\d+").Value
return $version
}
function Get-RustdocVersion {
$version = [regex]::matches($(rustdoc --version), "\d+\.\d+\.\d+").Value
return $version
$version = [regex]::matches($(rustdoc --version), "\d+\.\d+\.\d+").Value
return $version
}
function Get-RustfmtVersion {
$version = [regex]::matches($(rustfmt --version), "\d+\.\d+\.\d+").Value
return $version
$version = [regex]::matches($(rustfmt --version), "\d+\.\d+\.\d+").Value
return $version
}
function Get-RustClippyVersion {
$version = [regex]::matches($(cargo clippy --version), "\d+\.\d+\.\d+").Value
return $version
$version = [regex]::matches($(cargo clippy --version), "\d+\.\d+\.\d+").Value
return $version
}
function Get-BindgenVersion {
@@ -122,10 +123,8 @@ function Get-ChocoVersion {
}
function Get-VcpkgVersion {
($(vcpkg version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
$vcpkgVersion = $Matches.Version
$commitId = git -C "C:\vcpkg" rev-parse --short HEAD
return "Vcpkg $vcpkgVersion (build from master \<$commitId>)"
return "Vcpkg (build from master \<$commitId>)"
}
function Get-NPMVersion {