Browse Source

ci: add freeglut to Debian and Fedora base images

Brad King 4 years ago
parent
commit
53cb34cb23

+ 1 - 0
.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 \

+ 1 - 0
.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 \

+ 1 - 0
.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 \

+ 3 - 3
.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"