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

[Ubuntu] Revert Podman, buildah and skopeo for Ubuntu-24.04 (#9825)

Browse Source
This commit is contained in:
Erik Bershel
2024-05-10 13:31:07 +02:00
committed by GitHub
parent 441122013e
commit 6625f8ac5f
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -105,9 +105,7 @@ $tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion))
$tools.AddToolVersion("Bazel", $(Get-BazelVersion)) $tools.AddToolVersion("Bazel", $(Get-BazelVersion))
$tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion))
$tools.AddToolVersion("Bicep", $(Get-BicepVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
$tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
}
$tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion))
$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion))
$tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion))
@@ -152,14 +150,12 @@ $tools.AddToolVersion("Parcel", $(Get-ParcelVersion))
if (Test-IsUbuntu20) { if (Test-IsUbuntu20) {
$tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion)) $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion))
} }
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("Podman", $(Get-PodManVersion))
$tools.AddToolVersion("Podman", $(Get-PodManVersion))
}
$tools.AddToolVersion("Pulumi", $(Get-PulumiVersion)) $tools.AddToolVersion("Pulumi", $(Get-PulumiVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("R", $(Get-RVersion)) $tools.AddToolVersion("R", $(Get-RVersion))
$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion))
} }
$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion))
$tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion)) $tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("SVN", $(Get-SVNVersion)) $tools.AddToolVersion("SVN", $(Get-SVNVersion))

2
images/ubuntu/scripts/tests/Tools.Tests.ps1
View File

@@ -329,7 +329,7 @@ Describe "Phantomjs" -Skip:(-not (Test-IsUbuntu20)) {
} }
} }
Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { Describe "Containers" {
$testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} }
It "<ContainerCommand>" -TestCases $testCases { It "<ContainerCommand>" -TestCases $testCases {

1
images/ubuntu/templates/ubuntu-24.04.pkr.hcl
View File

@@ -286,6 +286,7 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-clang.sh", "${path.root}/../scripts/build/install-clang.sh",
"${path.root}/../scripts/build/install-cmake.sh", "${path.root}/../scripts/build/install-cmake.sh",
"${path.root}/../scripts/build/install-codeql-bundle.sh", "${path.root}/../scripts/build/install-codeql-bundle.sh",
"${path.root}/../scripts/build/install-container-tools.sh",
"${path.root}/../scripts/build/install-dotnetcore-sdk.sh", "${path.root}/../scripts/build/install-dotnetcore-sdk.sh",
"${path.root}/../scripts/build/install-gcc-compilers.sh", "${path.root}/../scripts/build/install-gcc-compilers.sh",
"${path.root}/../scripts/build/install-gfortran.sh", "${path.root}/../scripts/build/install-gfortran.sh",