From b07253f7544e2e51a7551e342f28500fabd830b1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 28 Jun 2021 10:58:15 -0400 Subject: ci: update keyserver URL The `sks-keyservers.net` keyserver pool is no longer provided. Switch to `keyserver.ubuntu.com` instead. --- .gitlab/ci/docker/debian10/install_rvm.sh | 2 +- .gitlab/ci/docker/fedora34/install_rvm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/docker/debian10/install_rvm.sh b/.gitlab/ci/docker/debian10/install_rvm.sh index 2bea511..75c5adc 100755 --- a/.gitlab/ci/docker/debian10/install_rvm.sh +++ b/.gitlab/ci/docker/debian10/install_rvm.sh @@ -8,7 +8,7 @@ apt-get install -y \ gnupg2 \ procps -gpg2 --keyserver hkp://pool.sks-keyservers.net \ +gpg2 --keyserver hkps://keyserver.ubuntu.com \ --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ 7D2BAF1CF37B13E2069D6956105BD0E739499BDB diff --git a/.gitlab/ci/docker/fedora34/install_rvm.sh b/.gitlab/ci/docker/fedora34/install_rvm.sh index 6d4fa97..fca5104 100755 --- a/.gitlab/ci/docker/fedora34/install_rvm.sh +++ b/.gitlab/ci/docker/fedora34/install_rvm.sh @@ -2,7 +2,7 @@ set -e -gpg2 --keyserver hkp://pool.sks-keyservers.net \ +gpg2 --keyserver hkps://keyserver.ubuntu.com \ --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ 7D2BAF1CF37B13E2069D6956105BD0E739499BDB -- cgit v0.12 From 53cb34cb2365557396e123cfa9bac1366ace3fe1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 28 Jun 2021 10:59:58 -0400 Subject: ci: add freeglut to Debian and Fedora base images --- .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 1 + .gitlab/ci/docker/debian10/install_deps.sh | 1 + .gitlab/ci/docker/fedora34/install_deps.sh | 1 + .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 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" -- cgit v0.12