diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-30 18:51:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-04-06 14:49:16 (GMT) |
| commit | 8ca8b74a969cc6b110e3e594e2cf7817edbdff4a (patch) | |
| tree | 25ac1c48ed6b2da9b68f93b36ff2135ef0fd0c72 /.gitlab | |
| parent | c80583d51915c38121fe9190a2723d53f4c836a3 (diff) | |
| download | CMake-8ca8b74a969cc6b110e3e594e2cf7817edbdff4a.zip CMake-8ca8b74a969cc6b110e3e594e2cf7817edbdff4a.tar.gz CMake-8ca8b74a969cc6b110e3e594e2cf7817edbdff4a.tar.bz2 | |
ci: add jq and DevIL to Debian and Fedora base images
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 5 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/debian10/install_deps.sh | 5 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora33/install_deps.sh | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 6 |
4 files changed, 15 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh index 3fc67e8..d84b3c8 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh @@ -19,6 +19,10 @@ apt-get install -y \ clang-6.0 \ libncurses6 +# Tools needed for the test suite. +apt-get install -y \ + jq + # Packages needed to test find modules. apt-get install -y \ alsa-utils \ @@ -34,6 +38,7 @@ apt-get install -y \ libbz2-dev \ libcups2-dev \ libcurl4-gnutls-dev \ + libdevil-dev \ libfontconfig1-dev \ libfreetype6-dev \ libgdal-dev \ diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index e885ae6..e6c9ba0 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -19,6 +19,10 @@ apt-get install -y \ clang-6.0 \ libncurses6 +# Tools needed for the test suite. +apt-get install -y \ + jq + # Packages needed to test find modules. apt-get install -y \ alsa-utils \ @@ -34,6 +38,7 @@ apt-get install -y \ libbz2-dev \ libcups2-dev \ libcurl4-gnutls-dev \ + libdevil-dev \ libfontconfig1-dev \ libfreetype6-dev \ libgdal-dev \ diff --git a/.gitlab/ci/docker/fedora33/install_deps.sh b/.gitlab/ci/docker/fedora33/install_deps.sh index c1391e3..cdfe35e 100755 --- a/.gitlab/ci/docker/fedora33/install_deps.sh +++ b/.gitlab/ci/docker/fedora33/install_deps.sh @@ -25,6 +25,7 @@ dnf install --setopt=install_weak_deps=False -y \ dnf install --setopt=install_weak_deps=False -y \ findutils \ file \ + jq \ which # Packages needed to test find modules. @@ -34,6 +35,7 @@ dnf install --setopt=install_weak_deps=False -y \ boost-devel boost-python3-devel \ bzip2-devel \ cups-devel \ + DevIL-devel \ doxygen \ expat-devel \ fontconfig-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index e40760e..2670ba5 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -33,7 +33,7 @@ ### Debian .debian10: - image: "kitware/cmake:ci-debian10-x86_64-2020-10-03" + image: "kitware/cmake:ci-debian10-x86_64-2021-04-06" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -48,7 +48,7 @@ CMake_SKIP_INSTALL: 1 .debian10_aarch64: - image: "kitware/cmake:ci-debian10-aarch64-2021-01-26" + image: "kitware/cmake:ci-debian10-aarch64-2021-04-06" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -57,7 +57,7 @@ ### Fedora .fedora33: - image: "kitware/cmake:ci-fedora33-x86_64-2020-11-13" + image: "kitware/cmake:ci-fedora33-x86_64-2021-04-06" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" |