Merge topic 'ci-swift'

c1479f08a8 ci: Enable Swift tests in debian10-ninja job in non-MR pipelines
4db7020811 ci: Move debian10_ninja job environment to shell script
0e7172e615 ci: Add Swift compiler runtime dependencies to Debian base image
46da86dcd9 ci: Verify content of ironpython package in Debian base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7022

5 files changed, 24 insertions, 4 deletions

diff --git a/.gitlab/ci/configure_debian10_ninja.cmake b/.gitlab/ci/configure_debian10_ninja.cmake
index 1be5381..8cf3835 100644
--- a/.gitlab/ci/configure_debian10_ninja.cmake
+++ b/.gitlab/ci/configure_debian10_ninja.cmake
@@ -77,4 +77,8 @@ set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
 set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
 set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
 
+if (NOT "$ENV{SWIFTC}" STREQUAL "")
+  set(CMAKE_Swift_COMPILER "$ENV{SWIFTC}" CACHE FILEPATH "")
+endif()
+
 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index 12a91e6..1c112dd 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -30,6 +30,10 @@ apt-get install -y \
     subversion \
     mercurial
 
+# Install swift runtime deps.
+apt-get install -y \
+    libncurses5
+
 # Packages needed to test find modules.
 apt-get install -y \
     alsa-utils \
@@ -87,14 +91,16 @@ apt-get install -y \
 apt-get install -y \
     libmono-system-windows-forms4.0-cil
 curl -L -O https://github.com/IronLanguages/ironpython2/releases/download/ipy-2.7.10/ironpython_2.7.10.deb
+echo 'e1aceec1d49ffa66e9059a52168a734999dcccc50164a60e2936649cae698f3e  ironpython_2.7.10.deb' > ironpython.sha256sum
+sha256sum --check ironpython.sha256sum
 dpkg -i ironpython_2.7.10.deb
-rm ironpython_2.7.10.deb
+rm ironpython_2.7.10.deb ironpython.sha256sum
 
 # Perforce
 curl -L -O https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz
 echo '72620c55e9389705582506d6f3388005fb4f674888a00a12a51edc2ae37823b3  helix-core-server.tgz' > helix.sha256sum
 sha256sum --check helix.sha256sum
 tar -C /usr/local/bin -xvzf helix-core-server.tgz -- p4 p4d
-rm helix-core-server.tgz
+rm helix-core-server.tgz helix.sha256sum
 
 apt-get clean
diff --git a/.gitlab/ci/env_debian10_ninja.cmake b/.gitlab/ci/env_debian10_ninja.cmake
deleted file mode 100644
index ec252b4..0000000
--- a/.gitlab/ci/env_debian10_ninja.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0")
diff --git a/.gitlab/ci/env_debian10_ninja.sh b/.gitlab/ci/env_debian10_ninja.sh
new file mode 100644
index 0000000..67d900c
--- /dev/null
+++ b/.gitlab/ci/env_debian10_ninja.sh
@@ -0,0 +1,11 @@
+export MY_RUBY_HOME="/usr/local/rvm/rubies/ruby-2.7.0"
+
+if test -z "$CI_MERGE_REQUEST_ID"; then
+  curl -L -O "https://download.swift.org/swift-5.5.3-release/ubuntu1804/swift-5.5.3-RELEASE/swift-5.5.3-RELEASE-ubuntu18.04.tar.gz"
+  echo '910634e2d97e14c43ed1f29caeb57fd01d10c2ff88cebb79baee1016b52c7492  swift-5.5.3-RELEASE-ubuntu18.04.tar.gz' > swift.sha256sum
+  sha256sum --check swift.sha256sum
+  mkdir /opt/swift
+  tar xzf swift-5.5.3-RELEASE-ubuntu18.04.tar.gz -C /opt/swift --strip-components=2
+  rm swift-5.5.3-RELEASE-ubuntu18.04.tar.gz swift.sha256sum
+  export SWIFTC="/opt/swift/bin/swiftc"
+fi
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 5e620f5..f53f6f9 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -45,7 +45,7 @@
 ### Debian
 
 .debian10:
-    image: "kitware/cmake:ci-debian10-x86_64-2022-02-21"
+    image: "kitware/cmake:ci-debian10-x86_64-2022-02-25"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"