From 866ccbe818eac94f4873a69f5a83daf58d2cd883 Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:45:14 +0200
Subject: [PATCH] [Ubuntu] Add swift to 22.04 (#6398)

---
 .../scripts/SoftwareReport/SoftwareReport.Generator.ps1     | 6 +++---
 images/linux/scripts/tests/Common.Tests.ps1                 | 2 +-
 images/linux/ubuntu2204.pkr.hcl                             | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index c66bcdeb..e486305e 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 b396f5b0..593fd1be 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 bf957f6c..cf95a117 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",