浏览代码

Merge topic 'ci-openal'

b97d371007 ci: Add OpenAL to Debian and Fedora base images

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7394
Brad King 3 年之前
父节点
当前提交
2f3ea66a76

+ 1 - 0
.gitlab/ci/docker/debian10-aarch64/install_deps.sh

@@ -64,6 +64,7 @@ apt-get install -y \
     libjsoncpp-dev \
     liblapack-dev \
     liblzma-dev \
+    libopenal-dev \
     libopenmpi-dev openmpi-bin \
     libpng-dev \
     libpq-dev postgresql-server-dev-11 \

+ 1 - 0
.gitlab/ci/docker/debian10/install_deps.sh

@@ -68,6 +68,7 @@ apt-get install -y \
     libjsoncpp-dev \
     liblapack-dev \
     liblzma-dev \
+    libopenal-dev \
     libopenmpi-dev openmpi-bin \
     libpng-dev \
     libpq-dev postgresql-server-dev-11 \

+ 1 - 0
.gitlab/ci/docker/fedora36/install_deps.sh

@@ -84,6 +84,7 @@ dnf install --setopt=install_weak_deps=False -y \
     libxml2-devel \
     libxslt-devel \
     mpich-devel \
+    openal-soft-devel \
     openmpi-devel \
     patch \
     perl \

+ 3 - 3
.gitlab/os-linux.yml

@@ -45,7 +45,7 @@
 ### Debian
 
 .debian10:
-    image: "kitware/cmake:ci-debian10-x86_64-2022-04-22"
+    image: "kitware/cmake:ci-debian10-x86_64-2022-06-21"
 
     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-04-22"
+    image: "kitware/cmake:ci-debian10-aarch64-2022-06-21"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora36:
-    image: "kitware/cmake:ci-fedora36-x86_64-2022-06-06"
+    image: "kitware/cmake:ci-fedora36-x86_64-2022-06-21"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"