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

[Ubuntu] Rework podman and tools installation (#5580)

Browse Source
This commit is contained in:
Mikhail Koliada
2022-05-20 15:40:31 +02:00
committed by GitHub
parent 984b0a83de
commit e4d58452f4
7 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,10 +149,14 @@ $toolsList = @(
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
$toolsList += @(
(Get-BuildahVersion),
(Get-PhantomJSVersion),
(Get-LeiningenVersion),
(Get-HHVMVersion),
(Get-HHVMVersion)
)
}
if (Test-IsUbuntu22) {
$toolsList += @(
(Get-BuildahVersion),
(Get-PodManVersion),
(Get-SkopeoVersion)
)

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

@@ -42,20 +42,17 @@ function Get-CodeQLBundleVersion {
function Get-PodManVersion {
$podmanVersion = podman --version | Take-OutputPart -Part 2
$aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
return "Podman $podmanVersion (apt source repository: $aptSourceRepo)"
return "Podman $podmanVersion"
}
function Get-BuildahVersion {
$buildahVersion = buildah --version | Take-OutputPart -Part 2
$aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)"
return "Buildah $buildahVersion"
}
function Get-SkopeoVersion {
$skopeoVersion = skopeo --version | Take-OutputPart -Part 2
$aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)"
return "Skopeo $skopeoVersion"
}
function Get-CMakeVersion {