From ef6a7921e504a79a35f8a358901824ba3ed15597 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 16 May 2022 20:19:59 -0400 Subject: gitlab-ci: use Fedora 36 images and environments --- .gitlab-ci.yml | 56 +++++++-------- .gitlab/ci/configure_fedora35_asan.cmake | 4 -- .gitlab/ci/configure_fedora35_clang_analyzer.cmake | 1 - .gitlab/ci/configure_fedora35_common.cmake | 7 -- .gitlab/ci/configure_fedora35_makefiles.cmake | 80 ---------------------- .gitlab/ci/configure_fedora35_ninja.cmake | 11 --- .gitlab/ci/configure_fedora35_ninja_multi.cmake | 2 - .gitlab/ci/configure_fedora35_sphinx.cmake | 2 - .gitlab/ci/configure_fedora35_sphinx_package.cmake | 13 ---- .gitlab/ci/configure_fedora35_tidy.cmake | 3 - .gitlab/ci/configure_fedora36_asan.cmake | 4 ++ .gitlab/ci/configure_fedora36_clang_analyzer.cmake | 1 + .gitlab/ci/configure_fedora36_common.cmake | 7 ++ .gitlab/ci/configure_fedora36_makefiles.cmake | 80 ++++++++++++++++++++++ .gitlab/ci/configure_fedora36_ninja.cmake | 11 +++ .gitlab/ci/configure_fedora36_ninja_multi.cmake | 2 + .gitlab/ci/configure_fedora36_sphinx.cmake | 2 + .gitlab/ci/configure_fedora36_sphinx_package.cmake | 13 ++++ .gitlab/ci/configure_fedora36_tidy.cmake | 3 + .gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp | 1 - .gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp | 1 + .gitlab/ci/env_fedora35_asan.sh | 2 - .gitlab/ci/env_fedora35_clang_analyzer.sh | 2 - .gitlab/ci/env_fedora35_makefiles.cmake | 2 - .gitlab/ci/env_fedora36_asan.sh | 2 + .gitlab/ci/env_fedora36_clang_analyzer.sh | 2 + .gitlab/ci/env_fedora36_makefiles.cmake | 2 + .gitlab/os-linux.yml | 58 ++++++++-------- .gitlab/upload.yml | 4 +- 29 files changed, 189 insertions(+), 189 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora35_asan.cmake delete mode 100644 .gitlab/ci/configure_fedora35_clang_analyzer.cmake delete mode 100644 .gitlab/ci/configure_fedora35_common.cmake delete mode 100644 .gitlab/ci/configure_fedora35_makefiles.cmake delete mode 100644 .gitlab/ci/configure_fedora35_ninja.cmake delete mode 100644 .gitlab/ci/configure_fedora35_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_fedora35_sphinx.cmake delete mode 100644 .gitlab/ci/configure_fedora35_sphinx_package.cmake delete mode 100644 .gitlab/ci/configure_fedora35_tidy.cmake create mode 100644 .gitlab/ci/configure_fedora36_asan.cmake create mode 100644 .gitlab/ci/configure_fedora36_clang_analyzer.cmake create mode 100644 .gitlab/ci/configure_fedora36_common.cmake create mode 100644 .gitlab/ci/configure_fedora36_makefiles.cmake create mode 100644 .gitlab/ci/configure_fedora36_ninja.cmake create mode 100644 .gitlab/ci/configure_fedora36_ninja_multi.cmake create mode 100644 .gitlab/ci/configure_fedora36_sphinx.cmake create mode 100644 .gitlab/ci/configure_fedora36_sphinx_package.cmake create mode 100644 .gitlab/ci/configure_fedora36_tidy.cmake delete mode 100644 .gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp create mode 100644 .gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp delete mode 100644 .gitlab/ci/env_fedora35_asan.sh delete mode 100644 .gitlab/ci/env_fedora35_clang_analyzer.sh delete mode 100644 .gitlab/ci/env_fedora35_makefiles.cmake create mode 100644 .gitlab/ci/env_fedora36_asan.sh create mode 100644 .gitlab/ci/env_fedora36_clang_analyzer.sh create mode 100644 .gitlab/ci/env_fedora36_makefiles.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7917803..47b8738 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ p:source-package: p:doc-package: extends: - - .fedora35_sphinx_package + - .fedora36_sphinx_package - .cmake_prep_doc_linux - .linux_builder_tags_qt - .cmake_doc_artifacts @@ -101,16 +101,16 @@ l:iwyu-debian10: - .linux_builder_tags - .run_automatically -l:tidy-fedora35: +l:tidy-fedora36: extends: - - .fedora35_tidy + - .fedora36_tidy - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically -l:sphinx-fedora35: +l:sphinx-fedora36: extends: - - .fedora35_sphinx + - .fedora36_sphinx - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically @@ -118,9 +118,9 @@ l:sphinx-fedora35: CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_JOB_HELP: "true" -l:clang-analyzer-fedora35: +l:clang-analyzer-fedora36: extends: - - .fedora35_clang_analyzer + - .fedora36_clang_analyzer - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically @@ -189,17 +189,17 @@ t:debian10-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora35-makefiles: +t:fedora36-makefiles: extends: - - .fedora35_makefiles + - .fedora36_makefiles - .cmake_test_linux_release - .linux_builder_tags_qt - .run_dependent - .needs_centos6_x86_64 -t:fedora35-makefiles-nospace: +t:fedora36-makefiles-nospace: extends: - - .fedora35_makefiles + - .fedora36_makefiles - .cmake_test_linux_release - .linux_builder_tags_qt - .cmake_junit_artifacts @@ -207,7 +207,7 @@ t:fedora35-makefiles-nospace: - .needs_centos6_x86_64 variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CI_BUILD_NAME: fedora35_makefiles_nospace + CMAKE_CI_BUILD_NAME: fedora36_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" t:cuda9.2-nvidia: @@ -268,9 +268,9 @@ t:hip4.2-radeon: variables: CMAKE_CI_NO_MR: "true" -b:fedora35-ninja: +b:fedora36-ninja: extends: - - .fedora35_ninja + - .fedora36_ninja - .cmake_build_linux - .cmake_build_artifacts - .linux_builder_tags_qt @@ -287,31 +287,31 @@ b:debian10-makefiles-inplace: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora35-ninja: +t:fedora36-ninja: extends: - - .fedora35_ninja + - .fedora36_ninja - .cmake_test_linux - .linux_builder_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - b:fedora35-ninja + - b:fedora36-ninja needs: - - b:fedora35-ninja + - b:fedora36-ninja variables: CMAKE_CI_JOB_CONTINUOUS: "true" -t:fedora35-ninja-multi: +t:fedora36-ninja-multi: extends: - - .fedora35_ninja_multi + - .fedora36_ninja_multi - .cmake_test_linux_external - .linux_builder_tags_qt - .cmake_junit_artifacts - .run_dependent dependencies: - - t:fedora35-ninja + - t:fedora36-ninja needs: - - t:fedora35-ninja + - t:fedora36-ninja t:intel2016-makefiles: extends: @@ -632,9 +632,9 @@ u:linux-aarch64-package: ## Sanitizer builds -b:fedora35-asan: +b:fedora36-asan: extends: - - .fedora35_asan + - .fedora36_asan - .cmake_build_linux - .cmake_build_artifacts - .linux_builder_tags_qt @@ -642,16 +642,16 @@ b:fedora35-asan: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora35-asan: +t:fedora36-asan: extends: - - .fedora35_asan + - .fedora36_asan - .cmake_memcheck_linux - .linux_builder_tags_qt - .run_dependent dependencies: - - b:fedora35-asan + - b:fedora36-asan needs: - - b:fedora35-asan + - b:fedora36-asan variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_fedora35_asan.cmake b/.gitlab/ci/configure_fedora35_asan.cmake deleted file mode 100644 index 84fefad..0000000 --- a/.gitlab/ci/configure_fedora35_asan.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "") -set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "") - -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 deleted file mode 100644 index 761a323..0000000 --- a/.gitlab/ci/configure_fedora35_clang_analyzer.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake") diff --git a/.gitlab/ci/configure_fedora35_common.cmake b/.gitlab/ci/configure_fedora35_common.cmake deleted file mode 100644 index 4484e26..0000000 --- a/.gitlab/ci/configure_fedora35_common.cmake +++ /dev/null @@ -1,7 +0,0 @@ -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 "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora35_makefiles.cmake b/.gitlab/ci/configure_fedora35_makefiles.cmake deleted file mode 100644 index 9dc5ca9..0000000 --- a/.gitlab/ci/configure_fedora35_makefiles.cmake +++ /dev/null @@ -1,80 +0,0 @@ -set(CMake_TEST_CTestUpdate_BZR "ON" CACHE BOOL "") -set(CMake_TEST_CTestUpdate_GIT "ON" CACHE BOOL "") -set(CMake_TEST_CTestUpdate_HG "ON" CACHE BOOL "") -set(CMake_TEST_CTestUpdate_SVN "ON" CACHE BOOL "") -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_CTestUpdate_P4 "ON" CACHE BOOL "") -endif() - -set(CMake_TEST_FindALSA "ON" CACHE BOOL "") -set(CMake_TEST_FindBLAS "All;static=1;Generic" CACHE STRING "") -set(CMake_TEST_FindBoost "ON" CACHE BOOL "") -set(CMake_TEST_FindBoost_Python "ON" CACHE BOOL "") -set(CMake_TEST_FindBZip2 "ON" CACHE BOOL "") -set(CMake_TEST_FindCups "ON" CACHE BOOL "") -set(CMake_TEST_FindCURL "ON" CACHE BOOL "") -set(CMake_TEST_FindDevIL "ON" CACHE BOOL "") -set(CMake_TEST_FindDoxygen_Dot "ON" CACHE BOOL "") -set(CMake_TEST_FindDoxygen "ON" CACHE BOOL "") -set(CMake_TEST_FindEXPAT "ON" CACHE BOOL "") -set(CMake_TEST_FindFontconfig "ON" CACHE BOOL "") -set(CMake_TEST_FindFreetype "ON" CACHE BOOL "") -set(CMake_TEST_FindGDAL "ON" CACHE BOOL "") -set(CMake_TEST_FindGIF "ON" CACHE BOOL "") -set(CMake_TEST_FindGit "ON" CACHE BOOL "") -set(CMake_TEST_FindGLEW "ON" CACHE BOOL "") -set(CMake_TEST_FindGLUT "ON" CACHE BOOL "") -set(CMake_TEST_FindGnuTLS "ON" CACHE BOOL "") -set(CMake_TEST_FindGSL "ON" CACHE BOOL "") -set(CMake_TEST_FindGTest "ON" CACHE BOOL "") -set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "") -set(CMake_TEST_FindIconv "ON" CACHE BOOL "") -set(CMake_TEST_FindICU "ON" CACHE BOOL "") -set(CMake_TEST_FindIntl "ON" CACHE BOOL "") -set(CMake_TEST_FindJNI "ON" CACHE BOOL "") -set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") -set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") -set(CMake_TEST_FindLAPACK "All;static=1;Generic" CACHE STRING "") -set(CMake_TEST_FindLibArchive "ON" CACHE BOOL "") -set(CMake_TEST_FindLibinput "ON" CACHE BOOL "") -set(CMake_TEST_FindLibLZMA "ON" CACHE BOOL "") -set(CMake_TEST_FindLibUV "ON" CACHE BOOL "") -set(CMake_TEST_FindLibXml2 "ON" CACHE BOOL "") -set(CMake_TEST_FindLibXslt "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_C "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_FindMPI "ON" CACHE BOOL "") -set(CMake_TEST_FindODBC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenSSL "ON" CACHE BOOL "") -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 "") -set(CMake_TEST_FindRuby "ON" CACHE BOOL "") -set(CMake_TEST_FindRuby_RVM "ON" CACHE BOOL "") -set(CMake_TEST_FindSDL "ON" CACHE BOOL "") -set(CMake_TEST_FindSQLite3 "ON" CACHE BOOL "") -set(CMake_TEST_FindTIFF "ON" CACHE BOOL "") -set(CMake_TEST_FindX11 "ON" CACHE BOOL "") -set(CMake_TEST_FindXalanC "ON" CACHE BOOL "") -set(CMake_TEST_FindXercesC "ON" CACHE BOOL "") -set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "") -set(CMake_TEST_ISPC "ON" CACHE STRING "") -set(CMake_TEST_Qt5 "ON" CACHE BOOL "") -set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora35_ninja.cmake b/.gitlab/ci/configure_fedora35_ninja.cmake deleted file mode 100644 index e6143b7..0000000 --- a/.gitlab/ci/configure_fedora35_ninja.cmake +++ /dev/null @@ -1,11 +0,0 @@ -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_fedora35_ninja_multi.cmake b/.gitlab/ci/configure_fedora35_ninja_multi.cmake deleted file mode 100644 index efb4b84..0000000 --- a/.gitlab/ci/configure_fedora35_ninja_multi.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(CMake_TEST_ISPC "ON" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora35_sphinx.cmake b/.gitlab/ci/configure_fedora35_sphinx.cmake deleted file mode 100644 index 90d159b..0000000 --- a/.gitlab/ci/configure_fedora35_sphinx.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora35_sphinx_package.cmake b/.gitlab/ci/configure_fedora35_sphinx_package.cmake deleted file mode 100644 index e839de8..0000000 --- a/.gitlab/ci/configure_fedora35_sphinx_package.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Disable formats not wanted in the package's documentation. -set(SPHINX_INFO OFF CACHE BOOL "") -set(SPHINX_SINGLEHTML OFF CACHE BOOL "") -set(SPHINX_TEXT OFF CACHE BOOL "") - -# Set the destination directory for docs that packages expect. -set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") - -# Use a custom prefix to avoid conflicting with other builds. -set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install-doc" CACHE PATH "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora35_tidy.cmake b/.gitlab/ci/configure_fedora35_tidy.cmake deleted file mode 100644 index 752d241..0000000 --- a/.gitlab/ci/configure_fedora35_tidy.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora35_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_asan.cmake b/.gitlab/ci/configure_fedora36_asan.cmake new file mode 100644 index 0000000..51977d9 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_asan.cmake @@ -0,0 +1,4 @@ +set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "") +set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_clang_analyzer.cmake b/.gitlab/ci/configure_fedora36_clang_analyzer.cmake new file mode 100644 index 0000000..456936b --- /dev/null +++ b/.gitlab/ci/configure_fedora36_clang_analyzer.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_common.cmake b/.gitlab/ci/configure_fedora36_common.cmake new file mode 100644 index 0000000..4484e26 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_common.cmake @@ -0,0 +1,7 @@ +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 "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_makefiles.cmake b/.gitlab/ci/configure_fedora36_makefiles.cmake new file mode 100644 index 0000000..9dc5ca9 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_makefiles.cmake @@ -0,0 +1,80 @@ +set(CMake_TEST_CTestUpdate_BZR "ON" CACHE BOOL "") +set(CMake_TEST_CTestUpdate_GIT "ON" CACHE BOOL "") +set(CMake_TEST_CTestUpdate_HG "ON" CACHE BOOL "") +set(CMake_TEST_CTestUpdate_SVN "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_CTestUpdate_P4 "ON" CACHE BOOL "") +endif() + +set(CMake_TEST_FindALSA "ON" CACHE BOOL "") +set(CMake_TEST_FindBLAS "All;static=1;Generic" CACHE STRING "") +set(CMake_TEST_FindBoost "ON" CACHE BOOL "") +set(CMake_TEST_FindBoost_Python "ON" CACHE BOOL "") +set(CMake_TEST_FindBZip2 "ON" CACHE BOOL "") +set(CMake_TEST_FindCups "ON" CACHE BOOL "") +set(CMake_TEST_FindCURL "ON" CACHE BOOL "") +set(CMake_TEST_FindDevIL "ON" CACHE BOOL "") +set(CMake_TEST_FindDoxygen_Dot "ON" CACHE BOOL "") +set(CMake_TEST_FindDoxygen "ON" CACHE BOOL "") +set(CMake_TEST_FindEXPAT "ON" CACHE BOOL "") +set(CMake_TEST_FindFontconfig "ON" CACHE BOOL "") +set(CMake_TEST_FindFreetype "ON" CACHE BOOL "") +set(CMake_TEST_FindGDAL "ON" CACHE BOOL "") +set(CMake_TEST_FindGIF "ON" CACHE BOOL "") +set(CMake_TEST_FindGit "ON" CACHE BOOL "") +set(CMake_TEST_FindGLEW "ON" CACHE BOOL "") +set(CMake_TEST_FindGLUT "ON" CACHE BOOL "") +set(CMake_TEST_FindGnuTLS "ON" CACHE BOOL "") +set(CMake_TEST_FindGSL "ON" CACHE BOOL "") +set(CMake_TEST_FindGTest "ON" CACHE BOOL "") +set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "") +set(CMake_TEST_FindIconv "ON" CACHE BOOL "") +set(CMake_TEST_FindICU "ON" CACHE BOOL "") +set(CMake_TEST_FindIntl "ON" CACHE BOOL "") +set(CMake_TEST_FindJNI "ON" CACHE BOOL "") +set(CMake_TEST_FindJPEG "ON" CACHE BOOL "") +set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") +set(CMake_TEST_FindLAPACK "All;static=1;Generic" CACHE STRING "") +set(CMake_TEST_FindLibArchive "ON" CACHE BOOL "") +set(CMake_TEST_FindLibinput "ON" CACHE BOOL "") +set(CMake_TEST_FindLibLZMA "ON" CACHE BOOL "") +set(CMake_TEST_FindLibUV "ON" CACHE BOOL "") +set(CMake_TEST_FindLibXml2 "ON" CACHE BOOL "") +set(CMake_TEST_FindLibXslt "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_C "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "") +set(CMake_TEST_FindMPI "ON" CACHE BOOL "") +set(CMake_TEST_FindODBC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenSSL "ON" CACHE BOOL "") +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 "") +set(CMake_TEST_FindRuby "ON" CACHE BOOL "") +set(CMake_TEST_FindRuby_RVM "ON" CACHE BOOL "") +set(CMake_TEST_FindSDL "ON" CACHE BOOL "") +set(CMake_TEST_FindSQLite3 "ON" CACHE BOOL "") +set(CMake_TEST_FindTIFF "ON" CACHE BOOL "") +set(CMake_TEST_FindX11 "ON" CACHE BOOL "") +set(CMake_TEST_FindXalanC "ON" CACHE BOOL "") +set(CMake_TEST_FindXercesC "ON" CACHE BOOL "") +set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "") +set(CMake_TEST_ISPC "ON" CACHE STRING "") +set(CMake_TEST_Qt5 "ON" CACHE BOOL "") +set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora36_ninja.cmake b/.gitlab/ci/configure_fedora36_ninja.cmake new file mode 100644 index 0000000..7e33513 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_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_fedora36_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_ninja_multi.cmake b/.gitlab/ci/configure_fedora36_ninja_multi.cmake new file mode 100644 index 0000000..efb4b84 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_ninja_multi.cmake @@ -0,0 +1,2 @@ +set(CMake_TEST_ISPC "ON" CACHE STRING "") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora36_sphinx.cmake b/.gitlab/ci/configure_fedora36_sphinx.cmake new file mode 100644 index 0000000..90d159b --- /dev/null +++ b/.gitlab/ci/configure_fedora36_sphinx.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_sphinx_package.cmake b/.gitlab/ci/configure_fedora36_sphinx_package.cmake new file mode 100644 index 0000000..e839de8 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_sphinx_package.cmake @@ -0,0 +1,13 @@ +# Disable formats not wanted in the package's documentation. +set(SPHINX_INFO OFF CACHE BOOL "") +set(SPHINX_SINGLEHTML OFF CACHE BOOL "") +set(SPHINX_TEXT OFF CACHE BOOL "") + +# Set the destination directory for docs that packages expect. +set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") + +# Use a custom prefix to avoid conflicting with other builds. +set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install-doc" CACHE PATH "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_sphinx.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora36_tidy.cmake b/.gitlab/ci/configure_fedora36_tidy.cmake new file mode 100644 index 0000000..38414d3 --- /dev/null +++ b/.gitlab/ci/configure_fedora36_tidy.cmake @@ -0,0 +1,3 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora36_common.cmake") diff --git a/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp deleted file mode 100644 index 8ec1a03..0000000 --- a/.gitlab/ci/ctest_memcheck_fedora35_asan.lsan.supp +++ /dev/null @@ -1 +0,0 @@ -# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp new file mode 100644 index 0000000..8ec1a03 --- /dev/null +++ b/.gitlab/ci/ctest_memcheck_fedora36_asan.lsan.supp @@ -0,0 +1 @@ +# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/env_fedora35_asan.sh b/.gitlab/ci/env_fedora35_asan.sh deleted file mode 100644 index e976486..0000000 --- a/.gitlab/ci/env_fedora35_asan.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/usr/bin/clang -export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora35_clang_analyzer.sh b/.gitlab/ci/env_fedora35_clang_analyzer.sh deleted file mode 100644 index d732c0b..0000000 --- a/.gitlab/ci/env_fedora35_clang_analyzer.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/usr/libexec/ccc-analyzer -export CXX=/usr/libexec/c++-analyzer diff --git a/.gitlab/ci/env_fedora35_makefiles.cmake b/.gitlab/ci/env_fedora35_makefiles.cmake deleted file mode 100644 index aa84e23..0000000 --- a/.gitlab/ci/env_fedora35_makefiles.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0") -set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}") diff --git a/.gitlab/ci/env_fedora36_asan.sh b/.gitlab/ci/env_fedora36_asan.sh new file mode 100644 index 0000000..e976486 --- /dev/null +++ b/.gitlab/ci/env_fedora36_asan.sh @@ -0,0 +1,2 @@ +export CC=/usr/bin/clang +export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora36_clang_analyzer.sh b/.gitlab/ci/env_fedora36_clang_analyzer.sh new file mode 100644 index 0000000..d732c0b --- /dev/null +++ b/.gitlab/ci/env_fedora36_clang_analyzer.sh @@ -0,0 +1,2 @@ +export CC=/usr/libexec/ccc-analyzer +export CXX=/usr/libexec/c++-analyzer diff --git a/.gitlab/ci/env_fedora36_makefiles.cmake b/.gitlab/ci/env_fedora36_makefiles.cmake new file mode 100644 index 0000000..2bcb6d0 --- /dev/null +++ b/.gitlab/ci/env_fedora36_makefiles.cmake @@ -0,0 +1,2 @@ +set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") +set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f9af14f..a822d94 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -5,7 +5,7 @@ ### Release .linux_prep_source: - image: "fedora:35" + image: "fedora:36" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -68,8 +68,8 @@ ### Fedora -.fedora35: - image: "kitware/cmake:ci-fedora35-x86_64-2022-04-22" +.fedora36: + image: "kitware/cmake:ci-fedora36-x86_64-2022-05-17" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" @@ -77,37 +77,37 @@ #### Lint builds -.fedora35_tidy: - extends: .fedora35 +.fedora36_tidy: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_tidy + CMAKE_CONFIGURATION: fedora36_tidy CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora35_clang_analyzer: - extends: .fedora35 +.fedora36_clang_analyzer: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_clang_analyzer + CMAKE_CONFIGURATION: fedora36_clang_analyzer CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora35_sphinx: - extends: .fedora35 +.fedora36_sphinx: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_sphinx + CMAKE_CONFIGURATION: fedora36_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMAKE_CI_NO_INSTALL: 1 -.fedora35_sphinx_package: - extends: .fedora35 +.fedora36_sphinx_package: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_sphinx_package + CMAKE_CONFIGURATION: fedora36_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -137,27 +137,27 @@ CMAKE_CI_NO_INSTALL: 1 CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora35_ninja: - extends: .fedora35 +.fedora36_ninja: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_ninja + CMAKE_CONFIGURATION: fedora36_ninja CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora35_ninja_multi: - extends: .fedora35 +.fedora36_ninja_multi: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_ninja_multi + CMAKE_CONFIGURATION: fedora36_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora35_makefiles: - extends: .fedora35 +.fedora36_makefiles: + extends: .fedora36 variables: - CMAKE_CONFIGURATION: fedora35_makefiles + CMAKE_CONFIGURATION: fedora36_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" @@ -189,13 +189,13 @@ CTEST_MEMORYCHECK_TYPE: AddressSanitizer CTEST_MEMORYCHECK_SANITIZER_OPTIONS: "" -.fedora35_asan: +.fedora36_asan: extends: - - .fedora35 + - .fedora36 - .fedora_asan_addon variables: - CMAKE_CONFIGURATION: fedora35_asan + CMAKE_CONFIGURATION: fedora36_asan ### Intel Compiler @@ -389,7 +389,7 @@ .cmake_codespell_linux: stage: build - extends: .fedora35 + extends: .fedora36 script: - codespell interruptible: true @@ -532,7 +532,7 @@ .cmake_org_help: stage: build extends: - - .fedora35 + - .fedora36 - .linux_builder_tags - .cmake_org_help_artifacts script: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index d831c3e..38d40a9 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -1,7 +1,7 @@ # Steps for uploading artifacts .rsync_upload_package: - image: "fedora:35" + image: "fedora:36" stage: upload tags: - cmake @@ -21,7 +21,7 @@ .rsync_upload_help: stage: upload - image: "fedora:35" + image: "fedora:36" tags: - cmake - docker -- cgit v0.12