Commit b4c3e8e8 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'ci-linux-updates' into release-3.20

c6a45968 ci: Enable jq-based tests on Linux builds
8ca8b74a

 ci: add jq and DevIL to Debian and Fedora base images
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !5987
parents c80583d5 c6a45968
......@@ -59,6 +59,7 @@ set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
......
......@@ -61,6 +61,7 @@ set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
......
set(BUILD_CursesDialog ON CACHE BOOL "")
set(BUILD_QtDialog ON CACHE BOOL "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment