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

fix android and docker sections

Browse Source
This commit is contained in:
Aleksandr Chebotov
2020-09-16 10:42:16 +03:00
parent 4a07ea61a8
commit 46fdad5e60
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
View File

@@ -52,6 +52,10 @@ function Build-AndroidTable {
"Package" = "Google APIs" "Package" = "Google APIs"
"Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo "Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo
}, },
@{
"Package" = "NDK"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
},
@{ @{
"Package" = "Android Support Repository" "Package" = "Android Support Repository"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository"
@@ -71,16 +75,12 @@ function Build-AndroidTable {
@{ @{
"Package" = "CMake" "Package" = "CMake"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake"
},
@{
"Package" = "NDK"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
} }
) | Where-Object { $_.Version } | ForEach-Object { ) | Where-Object { $_.Version } | ForEach-Object {
[PSCustomObject] @{ [PSCustomObject] @{
"Package Name" = $_.Package "Package Name" = $_.Package
"Version" = $_.Version "Version" = $_.Version
} }
} }
} }
@@ -109,7 +109,7 @@ function Get-AndroidPlatformVersions {
$packageInfoParts = Split-TableRowByColumns $_ $packageInfoParts = Split-TableRowByColumns $_
$revision = $packageInfoParts[1] $revision = $packageInfoParts[1]
$version = $packageInfoParts[0].split(";")[1] $version = $packageInfoParts[0].split(";")[1]
return "$version, (rev $revision)" return "$version (rev $revision)"
} }
[array]::Reverse($versions) [array]::Reverse($versions)
return ($versions -Join "<br>") return ($versions -Join "<br>")

2
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -79,8 +79,8 @@ $toolsList = @(
(Get-BazeliskVersion), (Get-BazeliskVersion),
(Get-CMakeVersion), (Get-CMakeVersion),
(Get-CurlVersion), (Get-CurlVersion),
(Get-DockerComposeVersion),
(Get-DockerMobyVersion), (Get-DockerMobyVersion),
(Get-DockerComposeVersion),
(Get-DockerBuildxVersion), (Get-DockerBuildxVersion),
(Get-GitVersion), (Get-GitVersion),
(Get-GitLFSVersion), (Get-GitLFSVersion),

4
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -10,12 +10,12 @@ function Get-AnsibleVersion {
function Get-AzCopy7Version { function Get-AzCopy7Version {
$azcopy7Version = azcopy --version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" $azcopy7Version = azcopy --version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-"
return "AzCopy7 (available by azcopy alias) $azcopy7Version" return "AzCopy7 $azcopy7Version (available by ``azcopy`` alias)"
} }
function Get-AzCopy10Version { function Get-AzCopy10Version {
$azcopy10Version = azcopy10 --version | Take-OutputPart -Part 2 $azcopy10Version = azcopy10 --version | Take-OutputPart -Part 2
return "AzCopy10 (available by azcopy10 alias) $azcopy10Version" return "AzCopy10 $azcopy10Version (available by ``azcopy10`` alias)"
} }
function Get-BazelVersion { function Get-BazelVersion {