diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-27 15:31:33 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-27 10:31:41 -0500 |
| commit | 7ac338be9830bdc936b52a4135504ed011418f3c (patch) | |
| tree | a3d727ccda591f2d374381215173a4d1734db73a /.gitlab | |
| parent | 77074c3eb5c2699079bbb86c8393816f71b75d82 (diff) | |
| parent | 85f16fe91338c704faecc5885355e6f0055f5757 (diff) | |
| download | cmake-7ac338be9830bdc936b52a4135504ed011418f3c.tar.gz | |
Merge topic 'ci-imagemagick'
85f16fe913 ci: add ImageMagick to Debian and Fedora base images
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8124
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 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora37/install_deps.sh | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 6 |
4 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh index 8b5a00128b..7396ad7ee1 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh @@ -78,6 +78,7 @@ apt-get install -y \ libjsoncpp-dev \ liblapack-dev \ liblzma-dev \ + libmagick++-dev \ libopenal-dev \ libopenmpi-dev openmpi-bin \ libosp-dev \ diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index 486b2f7e3e..3e5622ba5d 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -82,6 +82,7 @@ apt-get install -y \ libjsoncpp-dev \ liblapack-dev \ liblzma-dev \ + libmagick++-dev \ libopenal-dev \ libopenmpi-dev openmpi-bin \ libosp-dev \ diff --git a/.gitlab/ci/docker/fedora37/install_deps.sh b/.gitlab/ci/docker/fedora37/install_deps.sh index afb856042a..35089299a1 100755 --- a/.gitlab/ci/docker/fedora37/install_deps.sh +++ b/.gitlab/ci/docker/fedora37/install_deps.sh @@ -86,6 +86,7 @@ dnf install --setopt=install_weak_deps=False -y \ gsl-devel \ gtest-devel \ gtk2-devel \ + ImageMagick-c++-devel \ java-11-openjdk-devel \ jsoncpp-devel \ lapack-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index db344f633b..c00c4aaab3 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -45,7 +45,7 @@ ### Debian .debian10: - image: "kitware/cmake:ci-debian10-x86_64-2022-08-30" + image: "kitware/cmake:ci-debian10-x86_64-2023-01-26" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -60,7 +60,7 @@ CMAKE_CI_NO_INSTALL: 1 .debian10_aarch64: - image: "kitware/cmake:ci-debian10-aarch64-2022-08-30" + image: "kitware/cmake:ci-debian10-aarch64-2023-01-26" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -69,7 +69,7 @@ ### Fedora .fedora37: - image: "kitware/cmake:ci-fedora37-x86_64-2022-11-16" + image: "kitware/cmake:ci-fedora37-x86_64-2023-01-26" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" |