Przeglądaj źródła

ci: add OpenSP to Debian and Fedora base images

Brad King 3 lat temu
rodzic
commit
4bcdf1b992

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

@@ -80,6 +80,7 @@ apt-get install -y \
     liblzma-dev \
     libopenal-dev \
     libopenmpi-dev openmpi-bin \
+    libosp-dev \
     libpng-dev \
     libpq-dev postgresql-server-dev-11 \
     libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc \

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

@@ -84,6 +84,7 @@ apt-get install -y \
     liblzma-dev \
     libopenal-dev \
     libopenmpi-dev openmpi-bin \
+    libosp-dev \
     libpng-dev \
     libpq-dev postgresql-server-dev-11 \
     libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc \

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

@@ -92,6 +92,7 @@ dnf install --setopt=install_weak_deps=False -y \
     libinput-devel systemd-devel \
     libjpeg-turbo-devel \
     libpng-devel \
+    opensp-devel \
     postgresql-server-devel \
     libtiff-devel \
     libuv-devel \

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

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