diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-22 12:46:24 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-22 08:46:30 -0400 |
| commit | 43009235c3ff7334bdfc24aaf5a808726cda0753 (patch) | |
| tree | 951cc761ea8f5387e1d15e8d491165f41cd82179 | |
| parent | 271fdaea3a9325d5e8a2253dee29aaddf2225f48 (diff) | |
| parent | b97d371007be553d3ce64ef8db3986f8bfa987f7 (diff) | |
| download | cmake-43009235c3ff7334bdfc24aaf5a808726cda0753.tar.gz | |
Merge topic 'ci-openal' into release-3.24
b97d371007 ci: Add OpenAL to Debian and Fedora base images
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7394
| -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/fedora36/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 f0228f88cd..3dd814dd4a 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.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 \ diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index 9f50585195..f796816145 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.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 \ diff --git a/.gitlab/ci/docker/fedora36/install_deps.sh b/.gitlab/ci/docker/fedora36/install_deps.sh index 13c70e6797..b8ddfb9220 100755 --- a/.gitlab/ci/docker/fedora36/install_deps.sh +++ b/.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 \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 0b2d382e81..12fbc1e359 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-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" |