diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index df241051a..f4ca60b70 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -57,9 +57,8 @@ $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) -} +$languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) + # Package Management $packageManagement = $installedSoftware.AddHeader("Package Management") diff --git a/images/ubuntu/scripts/tests/Common.Tests.ps1 b/images/ubuntu/scripts/tests/Common.Tests.ps1 index 73a8ab2ee..38eaeb2b9 100644 --- a/images/ubuntu/scripts/tests/Common.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Common.Tests.ps1 @@ -24,7 +24,7 @@ Describe "PHP" { } } -Describe "Swift" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Swift" { It "swift" { "swift --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 76971e3cf..5fe65f4fb 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -284,6 +284,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-apache.sh", "${path.root}/../scripts/build/install-aws-tools.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-codeql-bundle.sh", "${path.root}/../scripts/build/install-container-tools.sh",