summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-18 17:54:14 (GMT)
committerBrad King <brad.king@kitware.com>2021-11-18 17:54:32 (GMT)
commitfae34ea00717a0d4368b0f1953237e7f7bdba3d5 (patch)
tree8aa3429b75421da34ae8282bad5178c8d8ca1bf5
parentff8c3acc0fbe037931680fc74b1a2d3f0af58c79 (diff)
downloadCMake-fae34ea00717a0d4368b0f1953237e7f7bdba3d5.zip
CMake-fae34ea00717a0d4368b0f1953237e7f7bdba3d5.tar.gz
CMake-fae34ea00717a0d4368b0f1953237e7f7bdba3d5.tar.bz2
ci: add gmock to Debian base images
It is already in the Fedora base images.
-rwxr-xr-x.gitlab/ci/docker/debian10-aarch64/install_deps.sh1
-rwxr-xr-x.gitlab/ci/docker/debian10/install_deps.sh1
-rw-r--r--.gitlab/os-linux.yml4
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
index d7f4f9c..d5c5e22 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
@@ -52,6 +52,7 @@ apt-get install -y \
libgif-dev \
libgl1-mesa-dev \
libglew-dev \
+ libgmock-dev \
libgrpc++-dev libgrpc-dev \
libgsl-dev \
libgtest-dev \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index b4d0f86..d3d6b67 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -52,6 +52,7 @@ apt-get install -y \
libgif-dev \
libgl1-mesa-dev \
libglew-dev \
+ libgmock-dev \
libgrpc++-dev libgrpc-dev \
libgsl-dev \
libgtest-dev \
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 7fce177..ff23ac9 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-10-05"
+ image: "kitware/cmake:ci-debian10-x86_64-2021-11-18"
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-10-05"
+ image: "kitware/cmake:ci-debian10-aarch64-2021-11-18"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"