diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-06 14:22:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-06 14:22:22 (GMT) |
| commit | ae41e325a7a5d44c9b45c8309fd89beecaf997ab (patch) | |
| tree | 1701b9e728a2cd485bafc9c162327fde01ede6f0 /.gitlab | |
| parent | 3afcb054801a0d16626473ae5c538a9841b37df8 (diff) | |
| parent | 3b581ab3aafe76e420db2e397b24d86f4064d2b2 (diff) | |
| download | CMake-ae41e325a7a5d44c9b45c8309fd89beecaf997ab.zip CMake-ae41e325a7a5d44c9b45c8309fd89beecaf997ab.tar.gz CMake-ae41e325a7a5d44c9b45c8309fd89beecaf997ab.tar.bz2 | |
Merge topic 'ci-ctest-update'
3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6596
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 6 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/debian10/install_deps.sh | 6 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora34/install_deps.sh | 5 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 6 |
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 f2ffcd6..d7f4f9c 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 14dc67d..b4d0f86 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 878b5f8..bef3a97 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 948775c..de370db 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" |