summaryrefslogtreecommitdiffstats
path: root/.gitlab/ci
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci')
-rw-r--r--.gitlab/ci/configure_debian10_aarch64_ninja.cmake1
-rw-r--r--.gitlab/ci/configure_debian10_ninja.cmake1
-rw-r--r--.gitlab/ci/configure_fedora33_tidy.cmake3
-rw-r--r--.gitlab/ci/configure_fedora34_common.cmake (renamed from .gitlab/ci/configure_fedora33_common.cmake)1
-rw-r--r--.gitlab/ci/configure_fedora34_makefiles.cmake (renamed from .gitlab/ci/configure_fedora33_makefiles.cmake)1
-rw-r--r--.gitlab/ci/configure_fedora34_ninja.cmake (renamed from .gitlab/ci/configure_fedora33_ninja.cmake)2
-rw-r--r--.gitlab/ci/configure_fedora34_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora33_ninja_multi.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_sphinx.cmake (renamed from .gitlab/ci/configure_fedora33_sphinx.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora33_sphinx_package.cmake)0
-rw-r--r--.gitlab/ci/configure_fedora34_tidy.cmake3
-rwxr-xr-x.gitlab/ci/docker/debian10-aarch64/install_deps.sh3
-rwxr-xr-x.gitlab/ci/docker/debian10/install_deps.sh3
-rw-r--r--.gitlab/ci/docker/fedora34/Dockerfile (renamed from .gitlab/ci/docker/fedora33/Dockerfile)4
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_deps.sh (renamed from .gitlab/ci/docker/fedora33/install_deps.sh)19
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_ispc.sh (renamed from .gitlab/ci/docker/fedora33/install_ispc.sh)0
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_rvm.sh (renamed from .gitlab/ci/docker/fedora33/install_rvm.sh)0
-rw-r--r--.gitlab/ci/env_fedora34_makefiles.cmake (renamed from .gitlab/ci/env_fedora33_makefiles.cmake)0
17 files changed, 30 insertions, 11 deletions
diff --git a/.gitlab/ci/configure_debian10_aarch64_ninja.cmake b/.gitlab/ci/configure_debian10_aarch64_ninja.cmake
index 8fc850c..4d8dde6 100644
--- a/.gitlab/ci/configure_debian10_aarch64_ninja.cmake
+++ b/.gitlab/ci/configure_debian10_aarch64_ninja.cmake
@@ -48,6 +48,7 @@ set(CMake_TEST_FindPatch "ON" CACHE BOOL "")
set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
+set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "")
set(CMake_TEST_FindPython "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_NumPy "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_PyPy "ON" CACHE BOOL "")
diff --git a/.gitlab/ci/configure_debian10_ninja.cmake b/.gitlab/ci/configure_debian10_ninja.cmake
index 94cf6c1..732624a 100644
--- a/.gitlab/ci/configure_debian10_ninja.cmake
+++ b/.gitlab/ci/configure_debian10_ninja.cmake
@@ -48,6 +48,7 @@ set(CMake_TEST_FindPatch "ON" CACHE BOOL "")
set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
+set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "")
set(CMake_TEST_FindPython "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_IronPython "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_NumPy "ON" CACHE BOOL "")
diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake
deleted file mode 100644
index 9052fdc..0000000
--- a/.gitlab/ci/configure_fedora33_tidy.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
diff --git a/.gitlab/ci/configure_fedora33_common.cmake b/.gitlab/ci/configure_fedora34_common.cmake
index dee78ab..4484e26 100644
--- a/.gitlab/ci/configure_fedora33_common.cmake
+++ b/.gitlab/ci/configure_fedora34_common.cmake
@@ -1,5 +1,6 @@
set(BUILD_CursesDialog ON CACHE BOOL "")
set(BUILD_QtDialog ON CACHE BOOL "")
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "")
diff --git a/.gitlab/ci/configure_fedora33_makefiles.cmake b/.gitlab/ci/configure_fedora34_makefiles.cmake
index 7519d95..48786e4 100644
--- a/.gitlab/ci/configure_fedora33_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora34_makefiles.cmake
@@ -48,6 +48,7 @@ set(CMake_TEST_FindPatch "ON" CACHE BOOL "")
set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
+set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "")
set(CMake_TEST_FindPython "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_NumPy "ON" CACHE BOOL "")
set(CMake_TEST_FindPython_PyPy "ON" CACHE BOOL "")
diff --git a/.gitlab/ci/configure_fedora33_ninja.cmake b/.gitlab/ci/configure_fedora34_ninja.cmake
index 883f425..37bc189 100644
--- a/.gitlab/ci/configure_fedora33_ninja.cmake
+++ b/.gitlab/ci/configure_fedora34_ninja.cmake
@@ -4,4 +4,4 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "")
# Cover compilation with C++11 only and not higher standards.
set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/configure_fedora33_ninja_multi.cmake b/.gitlab/ci/configure_fedora34_ninja_multi.cmake
index efb4b84..efb4b84 100644
--- a/.gitlab/ci/configure_fedora33_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora34_ninja_multi.cmake
diff --git a/.gitlab/ci/configure_fedora33_sphinx.cmake b/.gitlab/ci/configure_fedora34_sphinx.cmake
index 90d159b..90d159b 100644
--- a/.gitlab/ci/configure_fedora33_sphinx.cmake
+++ b/.gitlab/ci/configure_fedora34_sphinx.cmake
diff --git a/.gitlab/ci/configure_fedora33_sphinx_package.cmake b/.gitlab/ci/configure_fedora34_sphinx_package.cmake
index e839de8..e839de8 100644
--- a/.gitlab/ci/configure_fedora33_sphinx_package.cmake
+++ b/.gitlab/ci/configure_fedora34_sphinx_package.cmake
diff --git a/.gitlab/ci/configure_fedora34_tidy.cmake b/.gitlab/ci/configure_fedora34_tidy.cmake
new file mode 100644
index 0000000..9c79303
--- /dev/null
+++ b/.gitlab/ci/configure_fedora34_tidy.cmake
@@ -0,0 +1,3 @@
+set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
index d84b3c8..fea502e 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
@@ -45,6 +45,7 @@ apt-get install -y \
libgif-dev \
libgl1-mesa-dev \
libglew-dev \
+ libgrpc++-dev libgrpc-dev \
libgsl-dev \
libgtest-dev \
libgtk2.0-dev \
@@ -56,7 +57,7 @@ apt-get install -y \
libopenmpi-dev openmpi-bin \
libpng-dev \
libpq-dev postgresql-server-dev-11 \
- libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler \
+ libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc \
libsdl-dev \
libsqlite3-dev \
libtiff-dev \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index e6c9ba0..4bb03bc 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -45,6 +45,7 @@ apt-get install -y \
libgif-dev \
libgl1-mesa-dev \
libglew-dev \
+ libgrpc++-dev libgrpc-dev \
libgsl-dev \
libgtest-dev \
libgtk2.0-dev \
@@ -56,7 +57,7 @@ apt-get install -y \
libopenmpi-dev openmpi-bin \
libpng-dev \
libpq-dev postgresql-server-dev-11 \
- libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler \
+ libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc \
libsdl-dev \
libsqlite3-dev \
libtiff-dev \
diff --git a/.gitlab/ci/docker/fedora33/Dockerfile b/.gitlab/ci/docker/fedora34/Dockerfile
index 8ebcb9e..af2322d 100644
--- a/.gitlab/ci/docker/fedora33/Dockerfile
+++ b/.gitlab/ci/docker/fedora34/Dockerfile
@@ -1,10 +1,10 @@
-FROM fedora:33 as rvm-build
+FROM fedora:34 as rvm-build
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
COPY install_rvm.sh /root/install_rvm.sh
RUN sh /root/install_rvm.sh
-FROM fedora:33
+FROM fedora:34
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
COPY install_deps.sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/fedora33/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh
index cdfe35e..ece0666 100755
--- a/.gitlab/ci/docker/fedora33/install_deps.sh
+++ b/.gitlab/ci/docker/fedora34/install_deps.sh
@@ -6,7 +6,8 @@ set -e
dnf install --setopt=install_weak_deps=False -y \
ncurses-devel \
openssl-devel \
- qt5-qtbase-devel
+ qt5-qtbase-devel \
+ qt6-qtbase-devel
# Install development tools.
dnf install --setopt=install_weak_deps=False -y \
@@ -19,7 +20,12 @@ dnf install --setopt=install_weak_deps=False -y \
dnf install --setopt=install_weak_deps=False -y \
python3-sphinx \
texinfo \
- qt5-qttools-devel
+ qt5-qttools-devel \
+ qt6-qttools-devel
+
+# Install lint tools.
+dnf install --setopt=install_weak_deps=False -y \
+ codespell
# Tools needed for the test suite.
dnf install --setopt=install_weak_deps=False -y \
@@ -46,6 +52,7 @@ dnf install --setopt=install_weak_deps=False -y \
glew-devel \
gmock \
gnutls-devel \
+ grpc-devel grpc-plugins \
gsl-devel \
gtest-devel \
gtk2-devel \
@@ -67,7 +74,7 @@ dnf install --setopt=install_weak_deps=False -y \
protobuf-devel protobuf-c-devel protobuf-lite-devel \
pypy2 pypy2-devel \
pypy3 pypy3-devel \
- python2 python2-devel python2-numpy \
+ python2 python2-devel \
python3 python3-devel python3-numpy \
python3-jsmin python3-jsonschema \
ruby rubygems ruby-devel \
@@ -80,3 +87,9 @@ dnf install --setopt=install_weak_deps=False -y \
xz-devel
dnf clean all
+
+# Fedora no longer packages python2 numpy.
+curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
+python2 get-pip.py
+rm get-pip.py
+pip2.7 install numpy
diff --git a/.gitlab/ci/docker/fedora33/install_ispc.sh b/.gitlab/ci/docker/fedora34/install_ispc.sh
index fdc14b5..fdc14b5 100755
--- a/.gitlab/ci/docker/fedora33/install_ispc.sh
+++ b/.gitlab/ci/docker/fedora34/install_ispc.sh
diff --git a/.gitlab/ci/docker/fedora33/install_rvm.sh b/.gitlab/ci/docker/fedora34/install_rvm.sh
index 6d4fa97..6d4fa97 100755
--- a/.gitlab/ci/docker/fedora33/install_rvm.sh
+++ b/.gitlab/ci/docker/fedora34/install_rvm.sh
diff --git a/.gitlab/ci/env_fedora33_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake
index 1d0efa7..1d0efa7 100644
--- a/.gitlab/ci/env_fedora33_makefiles.cmake
+++ b/.gitlab/ci/env_fedora34_makefiles.cmake
generated by cgit v0.12 at 2025-03-09 22:49:13 (GMT)