diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c66bcdebb..e486305e4 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -53,14 +53,14 @@ $runtimesList = @( (Get-ClangVersions), (Get-ClangFormatVersions), (Get-ClangTidyVersions), - (Get-KotlinVersion) + (Get-KotlinVersion), + (Get-SwiftVersion) ) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $runtimesList += @( (Get-ErlangVersion), - (Get-ErlangRebar3Version), - (Get-SwiftVersion) + (Get-ErlangRebar3Version) ) } diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index b396f5b05..593fd1be3 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -29,7 +29,7 @@ Describe "PHP" { } } -Describe "Swift" -Skip:(Test-IsUbuntu22) { +Describe "Swift" { It "swift" { "swift --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index bf957f6c4..cf95a117b 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -282,6 +282,7 @@ build { "${path.root}/scripts/installers/apache.sh", "${path.root}/scripts/installers/aws.sh", "${path.root}/scripts/installers/clang.sh", + "${path.root}/scripts/installers/swift.sh", "${path.root}/scripts/installers/cmake.sh", "${path.root}/scripts/installers/codeql-bundle.sh", "${path.root}/scripts/installers/containers.sh",