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

add swift version to ubuntu 24 (#10578)

Browse Source
This commit is contained in:
kishorekumar-anchala
2024-09-10 21:23:10 +05:30
committed by GitHub
parent 27738cad72
commit c7adf5d533
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,9 +57,8 @@ $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion))
$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion))
$languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion))
$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion))
$languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion))
}
# Package Management # Package Management
$packageManagement = $installedSoftware.AddHeader("Package Management") $packageManagement = $installedSoftware.AddHeader("Package Management")

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

@@ -24,7 +24,7 @@ Describe "PHP" {
} }
} }
Describe "Swift" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { Describe "Swift" {
It "swift" { It "swift" {
"swift --version" | Should -ReturnZeroExitCode "swift --version" | Should -ReturnZeroExitCode
} }

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

@@ -284,6 +284,7 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-apache.sh", "${path.root}/../scripts/build/install-apache.sh",
"${path.root}/../scripts/build/install-aws-tools.sh", "${path.root}/../scripts/build/install-aws-tools.sh",
"${path.root}/../scripts/build/install-clang.sh", "${path.root}/../scripts/build/install-clang.sh",
"${path.root}/../scripts/build/install-swift.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-container-tools.sh",