summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-08-30 16:36:10 (GMT)
committerBrad King <brad.king@kitware.com>2022-08-30 16:46:03 (GMT)
commit4bcdf1b992804467bc39710c2670f828df479dff (patch)
tree2592a5cb0665d9a4b43365652dab63aa5209cd32
parent60a1ccbd6a913d09d7c0a3f2b104e60699718e07 (diff)
downloadCMake-4bcdf1b992804467bc39710c2670f828df479dff.zip
CMake-4bcdf1b992804467bc39710c2670f828df479dff.tar.gz
CMake-4bcdf1b992804467bc39710c2670f828df479dff.tar.bz2
ci: add OpenSP to Debian and Fedora base images
-rwxr-xr-x.gitlab/ci/docker/debian10-aarch64/install_deps.sh1
-rwxr-xr-x.gitlab/ci/docker/debian10/install_deps.sh1
-rwxr-xr-x.gitlab/ci/docker/fedora36/install_deps.sh1
-rw-r--r--.gitlab/os-linux.yml6
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 9a98538..8b5a001 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.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 \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index 36ef508..486b2f7 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.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 \
diff --git a/.gitlab/ci/docker/fedora36/install_deps.sh b/.gitlab/ci/docker/fedora36/install_deps.sh
index 141e540..f117888 100755
--- a/.gitlab/ci/docker/fedora36/install_deps.sh
+++ b/.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 \
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 765518a..74af444 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-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"