mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-17 04:31:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-base-images' into release-3.21

Browse Source 
53cb34cb23 ci: add freeglut to Debian and Fedora base images
b07253f754 ci: update keyserver URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6279
This commit is contained in:
Brad King
2021-06-28 16:10:33 +00:00
committed by Kitware Robot
parent 5694362d98 53cb34cb23
commit 20bed8d2ac
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/ci/docker/debian10-aarch64/install_deps.sh
View File

@@ -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
.gitlab/ci/docker/debian10/install_deps.sh
View File

@@ -27,6 +27,7 @@ apt-get install -y \
apt-get install -y \
alsa-utils \
doxygen graphviz \
freeglut3-dev \
gnutls-dev \
libarchive-dev \
libblas-dev \

2
.gitlab/ci/docker/debian10/install_rvm.sh
View File

@@ -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

1
.gitlab/ci/docker/fedora34/install_deps.sh
View File

@@ -51,6 +51,7 @@ dnf install --setopt=install_weak_deps=False -y \
doxygen \
expat-devel \
fontconfig-devel \
freeglut-devel \
freetype-devel \
gdal-devel \
gettext \

2
.gitlab/ci/docker/fedora34/install_rvm.sh
View File

@@ -2,7 +2,7 @@
set -e
gpg2 --keyserver hkp://pool.sks-keyservers.net \
gpg2 --keyserver hkps://keyserver.ubuntu.com \
--recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
7D2BAF1CF37B13E2069D6956105BD0E739499BDB

6
.gitlab/os-linux.yml
View File

@@ -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"