diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-23 13:37:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-23 13:37:40 (GMT) |
| commit | 71a6982e910eabab5329a038972a671c154226c6 (patch) | |
| tree | 025200cf39a40fa3ca462d25d029996e6290e38b /.gitlab | |
| parent | dcfb2d5f5d2c43f47925612798050c8acb7730f2 (diff) | |
| parent | 5db79b5cd36481a0505ce0678f257d45851c4645 (diff) | |
| download | CMake-71a6982e910eabab5329a038972a671c154226c6.zip CMake-71a6982e910eabab5329a038972a671c154226c6.tar.gz CMake-71a6982e910eabab5329a038972a671c154226c6.tar.bz2 | |
Merge topic 'gcc-modules-ci-missing-git'
5db79b5cd3 gitlab-ci: update to an image with git installed
3e1ace7f46 ci: add git to the CI image
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7398
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/docker/gcc_cxx_modules/install_deps.sh | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/docker/gcc_cxx_modules/install_deps.sh b/.gitlab/ci/docker/gcc_cxx_modules/install_deps.sh index 2556b54..b8b706b 100755 --- a/.gitlab/ci/docker/gcc_cxx_modules/install_deps.sh +++ b/.gitlab/ci/docker/gcc_cxx_modules/install_deps.sh @@ -3,5 +3,5 @@ set -e dnf install -y --setopt=install_weak_deps=False \ - gcc-c++ mpfr-devel libmpc-devel isl-devel flex bison file findutils diffutils + gcc-c++ mpfr-devel libmpc-devel isl-devel flex bison file findutils diffutils git-core dnf clean all diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 36b84db..25d5365 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -302,7 +302,7 @@ ### C++ modules .gcc_cxx_modules_x86_64: - image: "kitware/cmake:ci-gcc_cxx_modules-x86_64-2022-06-14" + image: "kitware/cmake:ci-gcc_cxx_modules-x86_64-2022-06-21" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |