Переглянути джерело

Merge topic 'ci-imagemagick'

85f16fe913 ci: add ImageMagick to Debian and Fedora base images

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8124
Brad King 2 роки тому
батько
коміт
7ac338be98

+ 1 - 0
.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 \

+ 1 - 0
.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 \

+ 1 - 0
.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 \

+ 3 - 3
.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"