summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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/fedora34/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 fea502e..f2ffcd6 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
@@ -27,6 +27,7 @@ apt-get install -y \
apt-get install -y \
alsa-utils \
doxygen graphviz \
+ freeglut3-dev \
gnutls-dev \
libarchive-dev \
libblas-dev \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index 4bb03bc..14dc67d 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -27,6 +27,7 @@ apt-get install -y \
apt-get install -y \
alsa-utils \
doxygen graphviz \
+ freeglut3-dev \
gnutls-dev \
libarchive-dev \
libblas-dev \
diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh
index 1992373..878b5f8 100755
--- a/.gitlab/ci/docker/fedora34/install_deps.sh
+++ b/.gitlab/ci/docker/fedora34/install_deps.sh
@@ -51,6 +51,7 @@ dnf install --setopt=install_weak_deps=False -y \
doxygen \
expat-devel \
fontconfig-devel \
+ freeglut-devel \
freetype-devel \
gdal-devel \
gettext \
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 06b98cc..8ce795e 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -45,7 +45,7 @@
### Debian
.debian10:
- image: "kitware/cmake:ci-debian10-x86_64-2021-05-11"
+ image: "kitware/cmake:ci-debian10-x86_64-2021-06-28"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -60,7 +60,7 @@
CMake_SKIP_INSTALL: 1
.debian10_aarch64:
- image: "kitware/cmake:ci-debian10-aarch64-2021-05-11"
+ image: "kitware/cmake:ci-debian10-aarch64-2021-06-28"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
### Fedora
.fedora34:
- image: "kitware/cmake:ci-fedora34-x86_64-2021-06-10"
+ image: "kitware/cmake:ci-fedora34-x86_64-2021-06-28"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"