diff options
Diffstat (limited to '.gitlab/ci')
-rw-r--r-- | .gitlab/ci/configure_fedora34_clang_analyzer.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora34_ninja.cmake | 7 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora34_tidy.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_asan.cmake (renamed from .gitlab/ci/configure_fedora34_asan.cmake) | 2 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_clang_analyzer.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_common.cmake (renamed from .gitlab/ci/configure_fedora34_common.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_makefiles.cmake (renamed from .gitlab/ci/configure_fedora34_makefiles.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_ninja.cmake | 11 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora34_ninja_multi.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_sphinx.cmake (renamed from .gitlab/ci/configure_fedora34_sphinx.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora34_sphinx_package.cmake) | 0 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora35_tidy.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp (renamed from .gitlab/ci/ctest_memcheck_fedora34_asan.lsan.supp) | 0 | ||||
-rw-r--r-- | .gitlab/ci/docker/fedora35/Dockerfile (renamed from .gitlab/ci/docker/fedora34/Dockerfile) | 4 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora35/install_deps.sh (renamed from .gitlab/ci/docker/fedora34/install_deps.sh) | 2 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora35/install_ispc.sh (renamed from .gitlab/ci/docker/fedora34/install_ispc.sh) | 0 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora35/install_rvm.sh (renamed from .gitlab/ci/docker/fedora34/install_rvm.sh) | 0 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora35_asan.sh (renamed from .gitlab/ci/env_fedora34_asan.sh) | 0 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora35_clang_analyzer.sh (renamed from .gitlab/ci/env_fedora34_clang_analyzer.sh) | 0 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora35_makefiles.cmake (renamed from .gitlab/ci/env_fedora34_makefiles.cmake) | 0 |
20 files changed, 19 insertions, 15 deletions
diff --git a/.gitlab/ci/configure_fedora34_clang_analyzer.cmake b/.gitlab/ci/configure_fedora34_clang_analyzer.cmake deleted file mode 100644 index e00f8a7..0000000 --- a/.gitlab/ci/configure_fedora34_clang_analyzer.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake") diff --git a/.gitlab/ci/configure_fedora34_ninja.cmake b/.gitlab/ci/configure_fedora34_ninja.cmake deleted file mode 100644 index 37bc189..0000000 --- a/.gitlab/ci/configure_fedora34_ninja.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CMake_TEST_ISPC "ON" CACHE STRING "") -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_fedora34_common.cmake") diff --git a/.gitlab/ci/configure_fedora34_tidy.cmake b/.gitlab/ci/configure_fedora34_tidy.cmake deleted file mode 100644 index 9c79303..0000000 --- a/.gitlab/ci/configure_fedora34_tidy.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake") diff --git a/.gitlab/ci/configure_fedora34_asan.cmake b/.gitlab/ci/configure_fedora35_asan.cmake index c22cdb7..84fefad 100644 --- a/.gitlab/ci/configure_fedora34_asan.cmake +++ b/.gitlab/ci/configure_fedora35_asan.cmake @@ -1,4 +1,4 @@ set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "") set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake") diff --git a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake b/.gitlab/ci/configure_fedora35_clang_analyzer.cmake new file mode 100644 index 0000000..761a323 --- /dev/null +++ b/.gitlab/ci/configure_fedora35_clang_analyzer.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake") diff --git a/.gitlab/ci/configure_fedora34_common.cmake b/.gitlab/ci/configure_fedora35_common.cmake index 4484e26..4484e26 100644 --- a/.gitlab/ci/configure_fedora34_common.cmake +++ b/.gitlab/ci/configure_fedora35_common.cmake diff --git a/.gitlab/ci/configure_fedora34_makefiles.cmake b/.gitlab/ci/configure_fedora35_makefiles.cmake index a482378..a482378 100644 --- a/.gitlab/ci/configure_fedora34_makefiles.cmake +++ b/.gitlab/ci/configure_fedora35_makefiles.cmake diff --git a/.gitlab/ci/configure_fedora35_ninja.cmake b/.gitlab/ci/configure_fedora35_ninja.cmake new file mode 100644 index 0000000..e6143b7 --- /dev/null +++ b/.gitlab/ci/configure_fedora35_ninja.cmake @@ -0,0 +1,11 @@ +set(CMake_TEST_ISPC "ON" CACHE STRING "") +set(CMake_TEST_GUI "ON" CACHE BOOL "") + +# "Release" flags without "-DNDEBUG" so we get assertions. +set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") +set(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE STRING "") + +# Cover compilation with C++11 only and not higher standards. +set(CMAKE_CXX_STANDARD "11" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake") diff --git a/.gitlab/ci/configure_fedora34_ninja_multi.cmake b/.gitlab/ci/configure_fedora35_ninja_multi.cmake index efb4b84..efb4b84 100644 --- a/.gitlab/ci/configure_fedora34_ninja_multi.cmake +++ b/.gitlab/ci/configure_fedora35_ninja_multi.cmake diff --git a/.gitlab/ci/configure_fedora34_sphinx.cmake b/.gitlab/ci/configure_fedora35_sphinx.cmake index 90d159b..90d159b 100644 --- a/.gitlab/ci/configure_fedora34_sphinx.cmake +++ b/.gitlab/ci/configure_fedora35_sphinx.cmake diff --git a/.gitlab/ci/configure_fedora34_sphinx_package.cmake b/.gitlab/ci/configure_fedora35_sphinx_package.cmake index e839de8..e839de8 100644 --- a/.gitlab/ci/configure_fedora34_sphinx_package.cmake +++ b/.gitlab/ci/configure_fedora35_sphinx_package.cmake diff --git a/.gitlab/ci/configure_fedora35_tidy.cmake b/.gitlab/ci/configure_fedora35_tidy.cmake new file mode 100644 index 0000000..752d241 --- /dev/null +++ b/.gitlab/ci/configure_fedora35_tidy.cmake @@ -0,0 +1,3 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake") diff --git a/.gitlab/ci/ctest_memcheck_fedora34_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp index 8ec1a03..8ec1a03 100644 --- a/.gitlab/ci/ctest_memcheck_fedora34_asan.lsan.supp +++ b/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp diff --git a/.gitlab/ci/docker/fedora34/Dockerfile b/.gitlab/ci/docker/fedora35/Dockerfile index af2322d..d1614b4 100644 --- a/.gitlab/ci/docker/fedora34/Dockerfile +++ b/.gitlab/ci/docker/fedora35/Dockerfile @@ -1,10 +1,10 @@ -FROM fedora:34 as rvm-build +FROM fedora:35 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:34 +FROM fedora:35 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh index bef3a97..30214af 100755 --- a/.gitlab/ci/docker/fedora34/install_deps.sh +++ b/.gitlab/ci/docker/fedora35/install_deps.sh @@ -75,7 +75,7 @@ dnf install --setopt=install_weak_deps=False -y \ libinput-devel systemd-devel \ libjpeg-turbo-devel \ libpng-devel \ - libpq-devel postgresql-server-devel \ + postgresql-server-devel \ libtiff-devel \ libuv-devel \ libxml2-devel \ diff --git a/.gitlab/ci/docker/fedora34/install_ispc.sh b/.gitlab/ci/docker/fedora35/install_ispc.sh index fdc14b5..fdc14b5 100755 --- a/.gitlab/ci/docker/fedora34/install_ispc.sh +++ b/.gitlab/ci/docker/fedora35/install_ispc.sh diff --git a/.gitlab/ci/docker/fedora34/install_rvm.sh b/.gitlab/ci/docker/fedora35/install_rvm.sh index fca5104..fca5104 100755 --- a/.gitlab/ci/docker/fedora34/install_rvm.sh +++ b/.gitlab/ci/docker/fedora35/install_rvm.sh diff --git a/.gitlab/ci/env_fedora34_asan.sh b/.gitlab/ci/env_fedora35_asan.sh index e976486..e976486 100644 --- a/.gitlab/ci/env_fedora34_asan.sh +++ b/.gitlab/ci/env_fedora35_asan.sh diff --git a/.gitlab/ci/env_fedora34_clang_analyzer.sh b/.gitlab/ci/env_fedora35_clang_analyzer.sh index d732c0b..d732c0b 100644 --- a/.gitlab/ci/env_fedora34_clang_analyzer.sh +++ b/.gitlab/ci/env_fedora35_clang_analyzer.sh diff --git a/.gitlab/ci/env_fedora34_makefiles.cmake b/.gitlab/ci/env_fedora35_makefiles.cmake index aa84e23..aa84e23 100644 --- a/.gitlab/ci/env_fedora34_makefiles.cmake +++ b/.gitlab/ci/env_fedora35_makefiles.cmake |