Merge topic 'ci-fedora35'

c76abba044 gitlab-ci: update to Fedora 35 base images
0ab6e5ca5b gitlab-ci: update to Fedora 35 for upload jobs
1729e1292d ci: update to Fedora 35 for Linux base images
89700cba9a clang-tidy: ignore warnings new in version 13
efe3af0119 Tests: Update FindBoost.TestPython for Python 3.10
a541c8f510 Utilities/Sphinx: Ignore warning in generated texinfo documentation

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6935

.clang-tidy

@@ -1,6 +1,8 @@
 ---
 Checks: "-*,\
 bugprone-*,\
+-bugprone-easily-swappable-parameters,\
+-bugprone-implicit-widening-of-multiplication-result,\
 -bugprone-macro-parentheses,\
 -bugprone-misplaced-widening-cast,\
 -bugprone-narrowing-conversions,\
@@ -12,6 +14,7 @@ misc-*,\
 -misc-static-assert,\
 modernize-*,\
 -modernize-avoid-c-arrays,\
+-modernize-return-braced-init-list,\
 -modernize-use-nodiscard,\
 -modernize-use-noexcept,\
 -modernize-use-trailing-return-type,\
@@ -27,6 +30,8 @@ readability-*,\
 -readability-magic-numbers,\
 -readability-named-parameter,\
 -readability-redundant-declaration,\
+-readability-redundant-member-init,\
+-readability-suspicious-call-argument,\
 -readability-uppercase-literal-suffix,\
 "
 HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$'

.gitlab-ci.yml

@@ -53,7 +53,7 @@ p:source-package:
 
 p:doc-package:
     extends:
-        - .fedora34_sphinx_package
+        - .fedora35_sphinx_package
         - .cmake_prep_doc_linux
         - .linux_builder_tags_qt
         - .cmake_doc_artifacts
@@ -119,16 +119,16 @@ l:iwyu-debian10:
         - .linux_builder_tags
         - .run_automatically
 
-l:tidy-fedora34:
+l:tidy-fedora35:
     extends:
-        - .fedora34_tidy
+        - .fedora35_tidy
         - .cmake_build_linux
         - .linux_builder_tags_qt
         - .run_automatically
 
-l:sphinx-fedora34:
+l:sphinx-fedora35:
     extends:
-        - .fedora34_sphinx
+        - .fedora35_sphinx
         - .cmake_build_linux
         - .linux_builder_tags_qt
         - .run_automatically
@@ -136,9 +136,9 @@ l:sphinx-fedora34:
         CMAKE_CI_JOB_CONTINUOUS: "true"
         CMAKE_CI_JOB_HELP: "true"
 
-l:clang-analyzer-fedora34:
+l:clang-analyzer-fedora35:
     extends:
-        - .fedora34_clang_analyzer
+        - .fedora35_clang_analyzer
         - .cmake_build_linux
         - .linux_builder_tags_qt
         - .run_automatically
@@ -207,17 +207,17 @@ t:debian10-makefiles-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora34-makefiles:
+t:fedora35-makefiles:
     extends:
-        - .fedora34_makefiles
+        - .fedora35_makefiles
         - .cmake_test_linux_release
         - .linux_builder_tags_qt
         - .run_dependent
         - .needs_centos6_x86_64
 
-t:fedora34-makefiles-nospace:
+t:fedora35-makefiles-nospace:
     extends:
-        - .fedora34_makefiles
+        - .fedora35_makefiles
         - .cmake_test_linux_release
         - .linux_builder_tags_qt
         - .cmake_junit_artifacts
@@ -225,7 +225,7 @@ t:fedora34-makefiles-nospace:
         - .needs_centos6_x86_64
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
-        CMAKE_CI_BUILD_NAME: fedora34_makefiles_nospace
+        CMAKE_CI_BUILD_NAME: fedora35_makefiles_nospace
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 t:cuda9.2-nvidia:
@@ -267,37 +267,37 @@ t:hip4.2-radeon:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:fedora34-ninja:
+b:fedora35-ninja:
     extends:
-        - .fedora34_ninja
+        - .fedora35_ninja
         - .cmake_build_linux
         - .cmake_build_artifacts
         - .linux_builder_tags_qt
         - .run_manually
 
-t:fedora34-ninja:
+t:fedora35-ninja:
     extends:
-        - .fedora34_ninja
+        - .fedora35_ninja
         - .cmake_test_linux
         - .linux_builder_tags_x11
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - b:fedora34-ninja
+        - b:fedora35-ninja
     needs:
-        - b:fedora34-ninja
+        - b:fedora35-ninja
 
-t:fedora34-ninja-multi:
+t:fedora35-ninja-multi:
     extends:
-        - .fedora34_ninja_multi
+        - .fedora35_ninja_multi
         - .cmake_test_linux_external
         - .linux_builder_tags_qt
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - t:fedora34-ninja
+        - t:fedora35-ninja
     needs:
-        - t:fedora34-ninja
+        - t:fedora35-ninja
 
 t:intel2016-makefiles:
     extends:
@@ -566,9 +566,9 @@ u:linux-aarch64-package:
 
 ## Sanitizer builds
 
-b:fedora34-asan:
+b:fedora35-asan:
     extends:
-        - .fedora34_asan
+        - .fedora35_asan
         - .cmake_build_linux
         - .cmake_build_artifacts
         - .linux_builder_tags_qt
@@ -576,16 +576,16 @@ b:fedora34-asan:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:fedora34-asan:
+t:fedora35-asan:
     extends:
-        - .fedora34_asan
+        - .fedora35_asan
         - .cmake_memcheck_linux
         - .linux_builder_tags_qt
         - .run_dependent
     dependencies:
-        - b:fedora34-asan
+        - b:fedora35-asan
     needs:
-        - b:fedora34-asan
+        - b:fedora35-asan
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 

.gitlab/ci/configure_fedora34_clang_analyzer.cmake

@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")

.gitlab/ci/configure_fedora34_tidy.cmake

@@ -1,3 +0,0 @@
-set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
-
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake")

.gitlab/ci/configure_fedora34_asan.cmake → .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")

.gitlab/ci/configure_fedora35_clang_analyzer.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")

.gitlab/ci/configure_fedora34_ninja.cmake → .gitlab/ci/configure_fedora35_ninja.cmake

@@ -8,4 +8,4 @@ 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_fedora34_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake")

.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")

.gitlab/ci/docker/fedora34/Dockerfile → .gitlab/ci/docker/fedora35/Dockerfile

@@ -1,10 +1,10 @@
-FROM fedora:34 as rvm-build
+FROM fedora:35 as rvm-build
 MAINTAINER Ben Boeckel <[email protected]>
 
 COPY install_rvm.sh /root/install_rvm.sh
 RUN sh /root/install_rvm.sh
 
-FROM fedora:34
+FROM fedora:35
 MAINTAINER Ben Boeckel <[email protected]>
 
 COPY install_deps.sh /root/install_deps.sh

.gitlab/ci/docker/fedora34/install_deps.sh → .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 \

.gitlab/os-linux.yml

@@ -5,7 +5,7 @@
 ### Release
 
 .linux_prep_source:
-    image: "fedora:34"
+    image: "fedora:35"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -68,8 +68,8 @@
 
 ### Fedora
 
-.fedora34:
-    image: "kitware/cmake:ci-fedora34-x86_64-2021-10-05"
+.fedora35:
+    image: "kitware/cmake:ci-fedora35-x86_64-2022-02-01"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
@@ -77,37 +77,37 @@
 
 #### Lint builds
 
-.fedora34_tidy:
-    extends: .fedora34
+.fedora35_tidy:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_tidy
+        CMAKE_CONFIGURATION: fedora35_tidy
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMake_SKIP_INSTALL: 1
 
-.fedora34_clang_analyzer:
-    extends: .fedora34
+.fedora35_clang_analyzer:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_clang_analyzer
+        CMAKE_CONFIGURATION: fedora35_clang_analyzer
         CMAKE_CI_BUILD_TYPE: Debug
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMake_SKIP_INSTALL: 1
 
-.fedora34_sphinx:
-    extends: .fedora34
+.fedora35_sphinx:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_sphinx
+        CMAKE_CONFIGURATION: fedora35_sphinx
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
         CMake_SKIP_INSTALL: 1
 
-.fedora34_sphinx_package:
-    extends: .fedora34
+.fedora35_sphinx_package:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_sphinx_package
+        CMAKE_CONFIGURATION: fedora35_sphinx_package
         CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
 
 #### Build and test
@@ -126,27 +126,27 @@
         CMAKE_CONFIGURATION: debian10_aarch64_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora34_ninja:
-    extends: .fedora34
+.fedora35_ninja:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_ninja
+        CMAKE_CONFIGURATION: fedora35_ninja
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.fedora34_ninja_multi:
-    extends: .fedora34
+.fedora35_ninja_multi:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_ninja_multi
+        CMAKE_CONFIGURATION: fedora35_ninja_multi
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.fedora34_makefiles:
-    extends: .fedora34
+.fedora35_makefiles:
+    extends: .fedora35
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_makefiles
+        CMAKE_CONFIGURATION: fedora35_makefiles
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_GENERATOR: "Unix Makefiles"
 
@@ -178,13 +178,13 @@
         CTEST_MEMORYCHECK_TYPE: AddressSanitizer
         CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
 
-.fedora34_asan:
+.fedora35_asan:
     extends:
-        - .fedora34
+        - .fedora35
         - .fedora_asan_addon
 
     variables:
-        CMAKE_CONFIGURATION: fedora34_asan
+        CMAKE_CONFIGURATION: fedora35_asan
 
 ### Intel Compiler
 
@@ -353,7 +353,7 @@
 
 .cmake_codespell_linux:
     stage: build
-    extends: .fedora34
+    extends: .fedora35
     script:
         - codespell
     interruptible: true
@@ -483,7 +483,7 @@
 .cmake_org_help:
     stage: build
     extends:
-        - .fedora34
+        - .fedora35
         - .linux_builder_tags
         - .cmake_org_help_artifacts
     script:

.gitlab/upload.yml

@@ -1,7 +1,7 @@
 # Steps for uploading artifacts
 
 .rsync_upload_binary:
-    image: "fedora:34"
+    image: "fedora:35"
     stage: upload
     tags:
         - cmake
@@ -20,7 +20,7 @@
 
 .rsync_upload_help:
     stage: upload
-    image: "fedora:34"
+    image: "fedora:35"
     tags:
         - cmake
         - docker

Tests/FindBoost/TestPython/CMakeLists.txt

@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.14)
 project(TestFindBoostPython CXX)
 include(CTest)
 
-find_package(Boost OPTIONAL_COMPONENTS python27 python34 python35 python36 python37 python38 python39)
+find_package(Boost OPTIONAL_COMPONENTS python27 python34 python35 python36 python37 python38 python39 python310)
 
 set(FAILTEST TRUE)
-foreach (v IN ITEMS 27 34 35 36 37 38 39)
+foreach (v IN ITEMS 27 34 35 36 37 38 39 310)
   if (Boost_PYTHON${v}_FOUND)
     set(FAILTEST FALSE)
     break()

Utilities/Sphinx/CMakeLists.txt

@@ -9,6 +9,7 @@ if(NOT CMake_SOURCE_DIR)
   include(${CMake_SOURCE_DIR}/Modules/CTestUseLaunchers.cmake)
   include(${CMake_SOURCE_DIR}/Source/CMakeVersion.cmake)
   include(${CMake_SOURCE_DIR}/Source/CMakeInstallDestinations.cmake)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake @ONLY)
   unset(CMAKE_DATA_DIR)
   unset(CMAKE_DATA_DIR CACHE)
   macro(CMake_OPTIONAL_COMPONENT)

Utilities/Sphinx/CTestCustom.cmake.in

@@ -0,0 +1,3 @@
+list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
+  "cmake.texi:[0-9]+: warning: .definfoenclose is obsolete"
+  )