From ada31706253c3953f48f86d571e5255cb4556113 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Oct 2020 09:28:08 -0400 Subject: ci: install gmock in the Fedora 31 image The gmock libraries are referenced by GTest's CMake package files. While at it, also explicitly install gettext. It is installed already, but make it explicit for future testing of the FindGettext module. (cherry picked from commit 585cc7c9301ff474a40d7702ce429b93f474d44f) --- .gitlab/ci/docker/fedora31/install_deps.sh | 2 ++ .gitlab/os-linux.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh index fa57f61..c1391e3 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora31/install_deps.sh @@ -39,8 +39,10 @@ dnf install --setopt=install_weak_deps=False -y \ fontconfig-devel \ freetype-devel \ gdal-devel \ + gettext \ giflib-devel \ glew-devel \ + gmock \ gnutls-devel \ gsl-devel \ gtest-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 9438676..4e8fb80 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -49,7 +49,7 @@ ### Fedora .fedora31: - image: "kitware/cmake:ci-fedora31-x86_64-2020-10-20" + image: "kitware/cmake:ci-fedora31-x86_64-2020-10-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" -- cgit v0.12