diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-19 14:08:04 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-19 09:08:16 -0500 |
| commit | 5cc6d7058ac06a262786fc7ea8c7849253a331aa (patch) | |
| tree | e10f08287f35cef2b10b85a5fba3bd0930a8e710 /.gitlab | |
| parent | 4a3480a7865285624e7684fb83c529cb35f657a4 (diff) | |
| parent | fae34ea00717a0d4368b0f1953237e7f7bdba3d5 (diff) | |
| download | cmake-5cc6d7058ac06a262786fc7ea8c7849253a331aa.tar.gz | |
Merge topic 'ci-gmock'
fae34ea007 ci: add gmock to Debian base images
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6746
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/debian10/install_deps.sh | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 4 |
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 d7f4f9c8f8..d5c5e22f54 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 b4d0f8676b..d3d6b67240 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 7fce1770da..ff23ac919b 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" |