summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-10-05 10:21:57 -0400
committerBrad King <brad.king@kitware.com>2021-10-05 11:06:42 -0400
commit3b581ab3aafe76e420db2e397b24d86f4064d2b2 (patch)
tree0c79516057e23f4fdac02c637e7ae93b9a4e12c7 /.gitlab
parent7518fc0c313277c889c7eb77f1e00406b547979e (diff)
downloadcmake-3b581ab3aafe76e420db2e397b24d86f4064d2b2.tar.gz
ci: Enable CTest.Update{CVS,SVN,HG} tests
Enable all three in Debian builds. Leave out CVS in Fedora builds because the cvs package was not built with `--enable-rootcommit`.
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci/docker/debian10-aarch64/install_deps.sh6
-rwxr-xr-x.gitlab/ci/docker/debian10/install_deps.sh6
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_deps.sh5
-rw-r--r--.gitlab/os-linux.yml6
4 files changed, 20 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
index f2ffcd6204..d7f4f9c8f8 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
@@ -23,6 +23,12 @@ apt-get install -y \
apt-get install -y \
jq
+# Packages needed to test CTest.
+apt-get install -y \
+ cvs \
+ subversion \
+ mercurial
+
# Packages needed to test find modules.
apt-get install -y \
alsa-utils \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index 14dc67dcc2..b4d0f8676b 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -23,6 +23,12 @@ apt-get install -y \
apt-get install -y \
jq
+# Packages needed to test CTest.
+apt-get install -y \
+ cvs \
+ subversion \
+ mercurial
+
# Packages needed to test find modules.
apt-get install -y \
alsa-utils \
diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh
index 878b5f868d..bef3a97e70 100755
--- a/.gitlab/ci/docker/fedora34/install_deps.sh
+++ b/.gitlab/ci/docker/fedora34/install_deps.sh
@@ -36,6 +36,11 @@ dnf install --setopt=install_weak_deps=False -y \
jq \
which
+# Packages needed to test CTest.
+dnf install --setopt=install_weak_deps=False -y \
+ subversion \
+ mercurial
+
# Packages needed to test CPack.
dnf install --setopt=install_weak_deps=False -y \
rpm-build
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 95cab05e59..b814655146 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -45,7 +45,7 @@
### Debian
.debian10:
- image: "kitware/cmake:ci-debian10-x86_64-2021-06-28"
+ image: "kitware/cmake:ci-debian10-x86_64-2021-10-05"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -60,7 +60,7 @@
CMake_SKIP_INSTALL: 1
.debian10_aarch64:
- image: "kitware/cmake:ci-debian10-aarch64-2021-06-28"
+ image: "kitware/cmake:ci-debian10-aarch64-2021-10-05"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
### Fedora
.fedora34:
- image: "kitware/cmake:ci-fedora34-x86_64-2021-06-28"
+ image: "kitware/cmake:ci-fedora34-x86_64-2021-10-05"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"