Skip to content
Snippets Groups Projects
Commit 8ca8b74a authored by Brad King's avatar Brad King
Browse files

ci: add jq and DevIL to Debian and Fedora base images

parent c80583d5
No related branches found
No related tags found
No related merge requests found
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment