From bdaa9e1e4ec626a9acc818553424e414c57633dd Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 22 May 2023 12:50:13 -0400 Subject: ci: use Fedora 38 images and environments --- .gitlab-ci.yml | 68 +++++++------- .gitlab/ci/configure_fedora37_asan.cmake | 4 - .gitlab/ci/configure_fedora37_clang_analyzer.cmake | 3 - .gitlab/ci/configure_fedora37_common.cmake | 7 -- .gitlab/ci/configure_fedora37_common_clang.cmake | 6 -- .gitlab/ci/configure_fedora37_extdeps.cmake | 1 - .gitlab/ci/configure_fedora37_makefiles.cmake | 100 --------------------- .../ci/configure_fedora37_makefiles_clang.cmake | 1 - .gitlab/ci/configure_fedora37_ninja.cmake | 14 --- .gitlab/ci/configure_fedora37_ninja_clang.cmake | 1 - .gitlab/ci/configure_fedora37_ninja_multi.cmake | 5 -- .gitlab/ci/configure_fedora37_sphinx.cmake | 2 - .gitlab/ci/configure_fedora37_sphinx_package.cmake | 13 --- .gitlab/ci/configure_fedora37_tidy.cmake | 5 -- .gitlab/ci/configure_fedora38_asan.cmake | 4 + .gitlab/ci/configure_fedora38_clang_analyzer.cmake | 3 + .gitlab/ci/configure_fedora38_common.cmake | 7 ++ .gitlab/ci/configure_fedora38_common_clang.cmake | 6 ++ .gitlab/ci/configure_fedora38_extdeps.cmake | 1 + .gitlab/ci/configure_fedora38_makefiles.cmake | 100 +++++++++++++++++++++ .../ci/configure_fedora38_makefiles_clang.cmake | 1 + .gitlab/ci/configure_fedora38_ninja.cmake | 14 +++ .gitlab/ci/configure_fedora38_ninja_clang.cmake | 1 + .gitlab/ci/configure_fedora38_ninja_multi.cmake | 5 ++ .gitlab/ci/configure_fedora38_sphinx.cmake | 2 + .gitlab/ci/configure_fedora38_sphinx_package.cmake | 13 +++ .gitlab/ci/configure_fedora38_tidy.cmake | 5 ++ .gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp | 1 - .gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp | 1 + .gitlab/ci/env_fedora37_asan.sh | 2 - .gitlab/ci/env_fedora37_clang_analyzer.sh | 2 - .gitlab/ci/env_fedora37_common_clang.sh | 4 - .gitlab/ci/env_fedora37_extdeps.sh | 1 - .gitlab/ci/env_fedora37_makefiles.cmake | 1 - .gitlab/ci/env_fedora37_makefiles.sh | 8 -- .gitlab/ci/env_fedora37_makefiles_clang.sh | 1 - .gitlab/ci/env_fedora37_ninja.sh | 3 - .gitlab/ci/env_fedora37_ninja_clang.sh | 1 - .gitlab/ci/env_fedora37_ninja_multi.sh | 3 - .gitlab/ci/env_fedora38_asan.sh | 2 + .gitlab/ci/env_fedora38_clang_analyzer.sh | 2 + .gitlab/ci/env_fedora38_common_clang.sh | 4 + .gitlab/ci/env_fedora38_extdeps.sh | 1 + .gitlab/ci/env_fedora38_makefiles.cmake | 1 + .gitlab/ci/env_fedora38_makefiles.sh | 8 ++ .gitlab/ci/env_fedora38_makefiles_clang.sh | 1 + .gitlab/ci/env_fedora38_ninja.sh | 3 + .gitlab/ci/env_fedora38_ninja_clang.sh | 1 + .gitlab/ci/env_fedora38_ninja_multi.sh | 3 + .gitlab/ci/pre_build_fedora37_tidy.sh | 9 -- .gitlab/ci/pre_build_fedora38_tidy.sh | 9 ++ .gitlab/os-linux.yml | 76 ++++++++-------- .gitlab/upload.yml | 4 +- 53 files changed, 272 insertions(+), 272 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora37_asan.cmake delete mode 100644 .gitlab/ci/configure_fedora37_clang_analyzer.cmake delete mode 100644 .gitlab/ci/configure_fedora37_common.cmake delete mode 100644 .gitlab/ci/configure_fedora37_common_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora37_extdeps.cmake delete mode 100644 .gitlab/ci/configure_fedora37_makefiles.cmake delete mode 100644 .gitlab/ci/configure_fedora37_makefiles_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora37_ninja.cmake delete mode 100644 .gitlab/ci/configure_fedora37_ninja_clang.cmake delete mode 100644 .gitlab/ci/configure_fedora37_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_fedora37_sphinx.cmake delete mode 100644 .gitlab/ci/configure_fedora37_sphinx_package.cmake delete mode 100644 .gitlab/ci/configure_fedora37_tidy.cmake create mode 100644 .gitlab/ci/configure_fedora38_asan.cmake create mode 100644 .gitlab/ci/configure_fedora38_clang_analyzer.cmake create mode 100644 .gitlab/ci/configure_fedora38_common.cmake create mode 100644 .gitlab/ci/configure_fedora38_common_clang.cmake create mode 100644 .gitlab/ci/configure_fedora38_extdeps.cmake create mode 100644 .gitlab/ci/configure_fedora38_makefiles.cmake create mode 100644 .gitlab/ci/configure_fedora38_makefiles_clang.cmake create mode 100644 .gitlab/ci/configure_fedora38_ninja.cmake create mode 100644 .gitlab/ci/configure_fedora38_ninja_clang.cmake create mode 100644 .gitlab/ci/configure_fedora38_ninja_multi.cmake create mode 100644 .gitlab/ci/configure_fedora38_sphinx.cmake create mode 100644 .gitlab/ci/configure_fedora38_sphinx_package.cmake create mode 100644 .gitlab/ci/configure_fedora38_tidy.cmake delete mode 100644 .gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp create mode 100644 .gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp delete mode 100644 .gitlab/ci/env_fedora37_asan.sh delete mode 100644 .gitlab/ci/env_fedora37_clang_analyzer.sh delete mode 100644 .gitlab/ci/env_fedora37_common_clang.sh delete mode 100644 .gitlab/ci/env_fedora37_extdeps.sh delete mode 100644 .gitlab/ci/env_fedora37_makefiles.cmake delete mode 100644 .gitlab/ci/env_fedora37_makefiles.sh delete mode 100644 .gitlab/ci/env_fedora37_makefiles_clang.sh delete mode 100644 .gitlab/ci/env_fedora37_ninja.sh delete mode 100644 .gitlab/ci/env_fedora37_ninja_clang.sh delete mode 100644 .gitlab/ci/env_fedora37_ninja_multi.sh create mode 100644 .gitlab/ci/env_fedora38_asan.sh create mode 100644 .gitlab/ci/env_fedora38_clang_analyzer.sh create mode 100644 .gitlab/ci/env_fedora38_common_clang.sh create mode 100644 .gitlab/ci/env_fedora38_extdeps.sh create mode 100644 .gitlab/ci/env_fedora38_makefiles.cmake create mode 100644 .gitlab/ci/env_fedora38_makefiles.sh create mode 100644 .gitlab/ci/env_fedora38_makefiles_clang.sh create mode 100644 .gitlab/ci/env_fedora38_ninja.sh create mode 100644 .gitlab/ci/env_fedora38_ninja_clang.sh create mode 100644 .gitlab/ci/env_fedora38_ninja_multi.sh delete mode 100644 .gitlab/ci/pre_build_fedora37_tidy.sh create mode 100644 .gitlab/ci/pre_build_fedora38_tidy.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 305c8d2..74c8104 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ p:source-package: p:doc-package: extends: - - .fedora37_sphinx_package + - .fedora38_sphinx_package - .cmake_prep_doc_linux - .linux_x86_64_tags - .cmake_doc_artifacts @@ -103,16 +103,16 @@ l:iwyu-debian10: - .linux_x86_64_tags - .run_automatically -l:tidy-fedora37: +l:tidy-fedora38: extends: - - .fedora37_tidy + - .fedora38_tidy - .cmake_build_linux - .linux_x86_64_tags - .run_automatically -l:sphinx-fedora37: +l:sphinx-fedora38: extends: - - .fedora37_sphinx + - .fedora38_sphinx - .cmake_build_linux - .cmake_sphinx_artifacts - .linux_x86_64_tags @@ -121,9 +121,9 @@ l:sphinx-fedora37: CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_JOB_HELP: "true" -l:clang-analyzer-fedora37: +l:clang-analyzer-fedora38: extends: - - .fedora37_clang_analyzer + - .fedora38_clang_analyzer - .cmake_build_linux - .linux_x86_64_tags - .run_automatically @@ -195,9 +195,9 @@ t:debian10-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora37-ninja-clang: +t:fedora38-ninja-clang: extends: - - .fedora37_ninja_clang + - .fedora38_ninja_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -205,9 +205,9 @@ t:fedora37-ninja-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora37-makefiles-clang: +t:fedora38-makefiles-clang: extends: - - .fedora37_makefiles_clang + - .fedora38_makefiles_clang - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent @@ -215,17 +215,17 @@ t:fedora37-makefiles-clang: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora37-makefiles: +t:fedora38-makefiles: extends: - - .fedora37_makefiles + - .fedora38_makefiles - .cmake_test_linux_release - .linux_x86_64_tags - .run_dependent - .needs_centos6_x86_64 -t:fedora37-makefiles-nospace: +t:fedora38-makefiles-nospace: extends: - - .fedora37_makefiles + - .fedora38_makefiles - .cmake_test_linux_release - .linux_x86_64_tags - .cmake_junit_artifacts @@ -233,7 +233,7 @@ t:fedora37-makefiles-nospace: - .needs_centos6_x86_64 variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" - CMAKE_CI_BUILD_NAME: fedora37_makefiles_nospace + CMAKE_CI_BUILD_NAME: fedora38_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" t:nvhpc22.11-ninja: @@ -354,9 +354,9 @@ t:linux-clang-cxx-modules-ninja-multi: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora37-ninja: +b:fedora38-ninja: extends: - - .fedora37_ninja + - .fedora38_ninja - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -391,40 +391,40 @@ b:debian10-aarch64-extdeps: variables: CMAKE_CI_JOB_NIGHTLY: "true" -b:fedora37-extdeps: +b:fedora38-extdeps: extends: - - .fedora37_extdeps + - .fedora38_extdeps - .cmake_build_linux_standalone - .linux_x86_64_tags - .run_manually variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora37-ninja: +t:fedora38-ninja: extends: - - .fedora37_ninja + - .fedora38_ninja - .cmake_test_linux - .linux_x86_64_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - b:fedora37-ninja + - b:fedora38-ninja needs: - - b:fedora37-ninja + - b:fedora38-ninja variables: CMAKE_CI_JOB_CONTINUOUS: "true" -t:fedora37-ninja-multi: +t:fedora38-ninja-multi: extends: - - .fedora37_ninja_multi + - .fedora38_ninja_multi - .cmake_test_linux_external - .linux_x86_64_tags - .cmake_junit_artifacts - .run_dependent dependencies: - - t:fedora37-ninja + - t:fedora38-ninja needs: - - t:fedora37-ninja + - t:fedora38-ninja t:intel2016-makefiles: extends: @@ -791,9 +791,9 @@ u:linux-aarch64-package: ## Sanitizer builds -b:fedora37-asan: +b:fedora38-asan: extends: - - .fedora37_asan + - .fedora38_asan - .cmake_build_linux - .cmake_build_artifacts - .linux_x86_64_tags @@ -801,16 +801,16 @@ b:fedora37-asan: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:fedora37-asan: +t:fedora38-asan: extends: - - .fedora37_asan + - .fedora38_asan - .cmake_memcheck_linux - .linux_x86_64_tags - .run_dependent dependencies: - - b:fedora37-asan + - b:fedora38-asan needs: - - b:fedora37-asan + - b:fedora38-asan variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_fedora37_asan.cmake b/.gitlab/ci/configure_fedora37_asan.cmake deleted file mode 100644 index 363e953..0000000 --- a/.gitlab/ci/configure_fedora37_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_fedora37_common.cmake") diff --git a/.gitlab/ci/configure_fedora37_clang_analyzer.cmake b/.gitlab/ci/configure_fedora37_clang_analyzer.cmake deleted file mode 100644 index 943c926..0000000 --- a/.gitlab/ci/configure_fedora37_clang_analyzer.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(configure_no_sccache 1) - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake") diff --git a/.gitlab/ci/configure_fedora37_common.cmake b/.gitlab/ci/configure_fedora37_common.cmake deleted file mode 100644 index 4484e26..0000000 --- a/.gitlab/ci/configure_fedora37_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_fedora37_common_clang.cmake b/.gitlab/ci/configure_fedora37_common_clang.cmake deleted file mode 100644 index 70c9df9..0000000 --- a/.gitlab/ci/configure_fedora37_common_clang.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "") -set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") -set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") -set(CMAKE_Fortran_FLAGS "-flang-experimental-exec" CACHE STRING "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora37_extdeps.cmake b/.gitlab/ci/configure_fedora37_extdeps.cmake deleted file mode 100644 index 8e545f5..0000000 --- a/.gitlab/ci/configure_fedora37_extdeps.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_extdeps_common.cmake") diff --git a/.gitlab/ci/configure_fedora37_makefiles.cmake b/.gitlab/ci/configure_fedora37_makefiles.cmake deleted file mode 100644 index c2f9982..0000000 --- a/.gitlab/ci/configure_fedora37_makefiles.cmake +++ /dev/null @@ -1,100 +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_FindHDF5 "ON" CACHE BOOL "") -set(CMake_TEST_FindHDF5_MPICH_C_COMPILER "/usr/lib64/mpich/bin/h5pcc" CACHE FILEPATH "") -# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/lib64/mpich/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist -set(CMake_TEST_FindHDF5_MPICH_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "") -set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/lib64/mpich/bin/h5pfc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/lib64/openmpi/bin/h5pcc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_OpenMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/openmpi/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/openmpi/lib" CACHE STRING "") -# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/lib64/openmpi/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist -set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/lib64/openmpi/bin/h5pfc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_Serial_CXX_COMPILER "/usr/bin/h5c++" CACHE FILEPATH "") -set(CMake_TEST_FindHDF5_Serial_Fortran_COMPILER "/usr/bin/h5fc" CACHE FILEPATH "") -set(CMake_TEST_FindIconv "ON" CACHE BOOL "") -set(CMake_TEST_FindICU "ON" CACHE BOOL "") -set(CMake_TEST_FindImageMagick "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_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "") -set(CMake_TEST_FindMPI "ON" CACHE BOOL "") -set(CMake_TEST_FindODBC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenAL "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_FindOpenSP "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_FindwxWidgets "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 "") -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() -set(CMake_TEST_Qt5 "ON" CACHE BOOL "") -set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") -set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora37_makefiles_clang.cmake b/.gitlab/ci/configure_fedora37_makefiles_clang.cmake deleted file mode 100644 index 7b82a9a..0000000 --- a/.gitlab/ci/configure_fedora37_makefiles_clang.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora37_ninja.cmake b/.gitlab/ci/configure_fedora37_ninja.cmake deleted file mode 100644 index 5b40677..0000000 --- a/.gitlab/ci/configure_fedora37_ninja.cmake +++ /dev/null @@ -1,14 +0,0 @@ -set(CMake_TEST_GUI "ON" CACHE BOOL "") -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() -set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") - -# "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_fedora37_common.cmake") diff --git a/.gitlab/ci/configure_fedora37_ninja_clang.cmake b/.gitlab/ci/configure_fedora37_ninja_clang.cmake deleted file mode 100644 index 7b82a9a..0000000 --- a/.gitlab/ci/configure_fedora37_ninja_clang.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora37_ninja_multi.cmake b/.gitlab/ci/configure_fedora37_ninja_multi.cmake deleted file mode 100644 index 94af721..0000000 --- a/.gitlab/ci/configure_fedora37_ninja_multi.cmake +++ /dev/null @@ -1,5 +0,0 @@ -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora37_sphinx.cmake b/.gitlab/ci/configure_fedora37_sphinx.cmake deleted file mode 100644 index 90d159b..0000000 --- a/.gitlab/ci/configure_fedora37_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_fedora37_sphinx_package.cmake b/.gitlab/ci/configure_fedora37_sphinx_package.cmake deleted file mode 100644 index e839de8..0000000 --- a/.gitlab/ci/configure_fedora37_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_fedora37_tidy.cmake b/.gitlab/ci/configure_fedora37_tidy.cmake deleted file mode 100644 index f8eb9ab..0000000 --- a/.gitlab/ci/configure_fedora37_tidy.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") -set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "") -set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora37_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_asan.cmake b/.gitlab/ci/configure_fedora38_asan.cmake new file mode 100644 index 0000000..8eae500 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_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_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_clang_analyzer.cmake b/.gitlab/ci/configure_fedora38_clang_analyzer.cmake new file mode 100644 index 0000000..c11eef1 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_clang_analyzer.cmake @@ -0,0 +1,3 @@ +set(configure_no_sccache 1) + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_common.cmake b/.gitlab/ci/configure_fedora38_common.cmake new file mode 100644 index 0000000..4484e26 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_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_fedora38_common_clang.cmake b/.gitlab/ci/configure_fedora38_common_clang.cmake new file mode 100644 index 0000000..70c9df9 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_common_clang.cmake @@ -0,0 +1,6 @@ +set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "") +set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") +set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") +set(CMAKE_Fortran_FLAGS "-flang-experimental-exec" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_extdeps.cmake b/.gitlab/ci/configure_fedora38_extdeps.cmake new file mode 100644 index 0000000..8e545f5 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_extdeps.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_extdeps_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_makefiles.cmake b/.gitlab/ci/configure_fedora38_makefiles.cmake new file mode 100644 index 0000000..c2f9982 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_makefiles.cmake @@ -0,0 +1,100 @@ +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_FindHDF5 "ON" CACHE BOOL "") +set(CMake_TEST_FindHDF5_MPICH_C_COMPILER "/usr/lib64/mpich/bin/h5pcc" CACHE FILEPATH "") +# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/lib64/mpich/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist +set(CMake_TEST_FindHDF5_MPICH_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "") +set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/lib64/mpich/bin/h5pfc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/lib64/openmpi/bin/h5pcc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_OpenMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/openmpi/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/openmpi/lib" CACHE STRING "") +# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/lib64/openmpi/bin/h5pc++" CACHE FILEPATH "") # h5pc++ does not exist +set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/lib64/openmpi/bin/h5pfc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_Serial_CXX_COMPILER "/usr/bin/h5c++" CACHE FILEPATH "") +set(CMake_TEST_FindHDF5_Serial_Fortran_COMPILER "/usr/bin/h5fc" CACHE FILEPATH "") +set(CMake_TEST_FindIconv "ON" CACHE BOOL "") +set(CMake_TEST_FindICU "ON" CACHE BOOL "") +set(CMake_TEST_FindImageMagick "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_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "") +set(CMake_TEST_FindMPI "ON" CACHE BOOL "") +set(CMake_TEST_FindODBC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenAL "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_FindOpenSP "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_FindwxWidgets "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 "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() +set(CMake_TEST_Qt5 "ON" CACHE BOOL "") +set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") +set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake new file mode 100644 index 0000000..ff30ad9 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja.cmake b/.gitlab/ci/configure_fedora38_ninja.cmake new file mode 100644 index 0000000..ac6b9f6 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_ninja.cmake @@ -0,0 +1,14 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() +set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") + +# "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_fedora38_common.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja_clang.cmake b/.gitlab/ci/configure_fedora38_ninja_clang.cmake new file mode 100644 index 0000000..ff30ad9 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_ninja_clang.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora38_ninja_multi.cmake b/.gitlab/ci/configure_fedora38_ninja_multi.cmake new file mode 100644 index 0000000..94af721 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_ninja_multi.cmake @@ -0,0 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_sphinx.cmake b/.gitlab/ci/configure_fedora38_sphinx.cmake new file mode 100644 index 0000000..90d159b --- /dev/null +++ b/.gitlab/ci/configure_fedora38_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_fedora38_sphinx_package.cmake b/.gitlab/ci/configure_fedora38_sphinx_package.cmake new file mode 100644 index 0000000..e839de8 --- /dev/null +++ b/.gitlab/ci/configure_fedora38_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_fedora38_tidy.cmake b/.gitlab/ci/configure_fedora38_tidy.cmake new file mode 100644 index 0000000..5b062da --- /dev/null +++ b/.gitlab/ci/configure_fedora38_tidy.cmake @@ -0,0 +1,5 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") +set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "") +set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common.cmake") diff --git a/.gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp deleted file mode 100644 index 8ec1a03..0000000 --- a/.gitlab/ci/ctest_memcheck_fedora37_asan.lsan.supp +++ /dev/null @@ -1 +0,0 @@ -# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp b/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp new file mode 100644 index 0000000..8ec1a03 --- /dev/null +++ b/.gitlab/ci/ctest_memcheck_fedora38_asan.lsan.supp @@ -0,0 +1 @@ +# Add 'leak:' lines here to suppress known leaks. diff --git a/.gitlab/ci/env_fedora37_asan.sh b/.gitlab/ci/env_fedora37_asan.sh deleted file mode 100644 index e976486..0000000 --- a/.gitlab/ci/env_fedora37_asan.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/usr/bin/clang -export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora37_clang_analyzer.sh b/.gitlab/ci/env_fedora37_clang_analyzer.sh deleted file mode 100644 index d732c0b..0000000 --- a/.gitlab/ci/env_fedora37_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_fedora37_common_clang.sh b/.gitlab/ci/env_fedora37_common_clang.sh deleted file mode 100644 index b03b757..0000000 --- a/.gitlab/ci/env_fedora37_common_clang.sh +++ /dev/null @@ -1,4 +0,0 @@ -export CC=/usr/bin/clang-15 -export CXX=/usr/bin/clang++-15 -export FC=/usr/bin/flang-new -export FFLAGS=-flang-experimental-exec diff --git a/.gitlab/ci/env_fedora37_extdeps.sh b/.gitlab/ci/env_fedora37_extdeps.sh deleted file mode 100644 index 7076e18..0000000 --- a/.gitlab/ci/env_fedora37_extdeps.sh +++ /dev/null @@ -1 +0,0 @@ -source .gitlab/ci/env_extdeps_common.sh diff --git a/.gitlab/ci/env_fedora37_makefiles.cmake b/.gitlab/ci/env_fedora37_makefiles.cmake deleted file mode 100644 index ef13cda..0000000 --- a/.gitlab/ci/env_fedora37_makefiles.cmake +++ /dev/null @@ -1 +0,0 @@ -set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") diff --git a/.gitlab/ci/env_fedora37_makefiles.sh b/.gitlab/ci/env_fedora37_makefiles.sh deleted file mode 100644 index c482642..0000000 --- a/.gitlab/ci/env_fedora37_makefiles.sh +++ /dev/null @@ -1,8 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi - -# Patch HDF5 Fortran compiler wrappers to work around Fedora bug. -# https://bugzilla.redhat.com/show_bug.cgi?id=2183289 -sed -i '/^includedir=/ s|/mpich-x86_64||' /usr/lib64/mpich/bin/h5pfc -sed -i '/^includedir=/ s|/openmpi-x86_64||' /usr/lib64/openmpi/bin/h5pfc diff --git a/.gitlab/ci/env_fedora37_makefiles_clang.sh b/.gitlab/ci/env_fedora37_makefiles_clang.sh deleted file mode 100644 index 9ff1d84..0000000 --- a/.gitlab/ci/env_fedora37_makefiles_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora37_common_clang.sh diff --git a/.gitlab/ci/env_fedora37_ninja.sh b/.gitlab/ci/env_fedora37_ninja.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_fedora37_ninja.sh +++ /dev/null @@ -1,3 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi diff --git a/.gitlab/ci/env_fedora37_ninja_clang.sh b/.gitlab/ci/env_fedora37_ninja_clang.sh deleted file mode 100644 index 9ff1d84..0000000 --- a/.gitlab/ci/env_fedora37_ninja_clang.sh +++ /dev/null @@ -1 +0,0 @@ -. .gitlab/ci/env_fedora37_common_clang.sh diff --git a/.gitlab/ci/env_fedora37_ninja_multi.sh b/.gitlab/ci/env_fedora37_ninja_multi.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_fedora37_ninja_multi.sh +++ /dev/null @@ -1,3 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi diff --git a/.gitlab/ci/env_fedora38_asan.sh b/.gitlab/ci/env_fedora38_asan.sh new file mode 100644 index 0000000..e976486 --- /dev/null +++ b/.gitlab/ci/env_fedora38_asan.sh @@ -0,0 +1,2 @@ +export CC=/usr/bin/clang +export CXX=/usr/bin/clang++ diff --git a/.gitlab/ci/env_fedora38_clang_analyzer.sh b/.gitlab/ci/env_fedora38_clang_analyzer.sh new file mode 100644 index 0000000..d732c0b --- /dev/null +++ b/.gitlab/ci/env_fedora38_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_fedora38_common_clang.sh b/.gitlab/ci/env_fedora38_common_clang.sh new file mode 100644 index 0000000..fc9c041 --- /dev/null +++ b/.gitlab/ci/env_fedora38_common_clang.sh @@ -0,0 +1,4 @@ +export CC=/usr/bin/clang-16 +export CXX=/usr/bin/clang++-16 +export FC=/usr/bin/flang-new +export FFLAGS=-flang-experimental-exec diff --git a/.gitlab/ci/env_fedora38_extdeps.sh b/.gitlab/ci/env_fedora38_extdeps.sh new file mode 100644 index 0000000..7076e18 --- /dev/null +++ b/.gitlab/ci/env_fedora38_extdeps.sh @@ -0,0 +1 @@ +source .gitlab/ci/env_extdeps_common.sh diff --git a/.gitlab/ci/env_fedora38_makefiles.cmake b/.gitlab/ci/env_fedora38_makefiles.cmake new file mode 100644 index 0000000..ef13cda --- /dev/null +++ b/.gitlab/ci/env_fedora38_makefiles.cmake @@ -0,0 +1 @@ +set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4") diff --git a/.gitlab/ci/env_fedora38_makefiles.sh b/.gitlab/ci/env_fedora38_makefiles.sh new file mode 100644 index 0000000..c482642 --- /dev/null +++ b/.gitlab/ci/env_fedora38_makefiles.sh @@ -0,0 +1,8 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi + +# Patch HDF5 Fortran compiler wrappers to work around Fedora bug. +# https://bugzilla.redhat.com/show_bug.cgi?id=2183289 +sed -i '/^includedir=/ s|/mpich-x86_64||' /usr/lib64/mpich/bin/h5pfc +sed -i '/^includedir=/ s|/openmpi-x86_64||' /usr/lib64/openmpi/bin/h5pfc diff --git a/.gitlab/ci/env_fedora38_makefiles_clang.sh b/.gitlab/ci/env_fedora38_makefiles_clang.sh new file mode 100644 index 0000000..9f3edde --- /dev/null +++ b/.gitlab/ci/env_fedora38_makefiles_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_ninja.sh b/.gitlab/ci/env_fedora38_ninja.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora38_ninja.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_fedora38_ninja_clang.sh b/.gitlab/ci/env_fedora38_ninja_clang.sh new file mode 100644 index 0000000..9f3edde --- /dev/null +++ b/.gitlab/ci/env_fedora38_ninja_clang.sh @@ -0,0 +1 @@ +. .gitlab/ci/env_fedora38_common_clang.sh diff --git a/.gitlab/ci/env_fedora38_ninja_multi.sh b/.gitlab/ci/env_fedora38_ninja_multi.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora38_ninja_multi.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/pre_build_fedora37_tidy.sh b/.gitlab/ci/pre_build_fedora37_tidy.sh deleted file mode 100644 index 7580ef1..0000000 --- a/.gitlab/ci/pre_build_fedora37_tidy.sh +++ /dev/null @@ -1,9 +0,0 @@ -cmake \ - -G Ninja \ - -S Utilities/ClangTidyModule \ - -B Utilities/ClangTidyModule/build \ - -DCMAKE_BUILD_TYPE=Release \ - -DRUN_TESTS=ON \ - -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -cmake --build Utilities/ClangTidyModule/build -ctest --test-dir Utilities/ClangTidyModule/build --output-on-failure diff --git a/.gitlab/ci/pre_build_fedora38_tidy.sh b/.gitlab/ci/pre_build_fedora38_tidy.sh new file mode 100644 index 0000000..7580ef1 --- /dev/null +++ b/.gitlab/ci/pre_build_fedora38_tidy.sh @@ -0,0 +1,9 @@ +cmake \ + -G Ninja \ + -S Utilities/ClangTidyModule \ + -B Utilities/ClangTidyModule/build \ + -DCMAKE_BUILD_TYPE=Release \ + -DRUN_TESTS=ON \ + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache +cmake --build Utilities/ClangTidyModule/build +ctest --test-dir Utilities/ClangTidyModule/build --output-on-failure diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 4ac7772..afce62b 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -5,7 +5,7 @@ ### Release .linux_prep_source: - image: "fedora:37" + image: "fedora:38" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -68,8 +68,8 @@ ### Fedora -.fedora37: - image: "kitware/cmake:ci-fedora37-x86_64-2023-05-17" +.fedora38: + image: "kitware/cmake:ci-fedora38-x86_64-2023-05-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" @@ -77,37 +77,37 @@ #### Lint builds -.fedora37_tidy: - extends: .fedora37 +.fedora38_tidy: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_tidy + CMAKE_CONFIGURATION: fedora38_tidy CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora37_clang_analyzer: - extends: .fedora37 +.fedora38_clang_analyzer: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_clang_analyzer + CMAKE_CONFIGURATION: fedora38_clang_analyzer CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_CI_NO_INSTALL: 1 -.fedora37_sphinx: - extends: .fedora37 +.fedora38_sphinx: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_sphinx + CMAKE_CONFIGURATION: fedora38_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMAKE_CI_NO_INSTALL: 1 -.fedora37_sphinx_package: - extends: .fedora37 +.fedora38_sphinx_package: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_sphinx_package + CMAKE_CONFIGURATION: fedora38_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -153,35 +153,35 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora37_extdeps: - extends: .fedora37 +.fedora38_extdeps: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_extdeps + CMAKE_CONFIGURATION: fedora38_extdeps CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora37_ninja: - extends: .fedora37 +.fedora38_ninja: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_ninja + CMAKE_CONFIGURATION: fedora38_ninja CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora37_ninja_multi: - extends: .fedora37 +.fedora38_ninja_multi: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_ninja_multi + CMAKE_CONFIGURATION: fedora38_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora37_makefiles: - extends: .fedora37 +.fedora38_makefiles: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_makefiles + CMAKE_CONFIGURATION: fedora38_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" @@ -200,18 +200,18 @@ variables: CMAKE_CONFIGURATION: debian10_ninja_clang -.fedora37_makefiles_clang: - extends: .fedora37 +.fedora38_makefiles_clang: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_makefiles_clang + CMAKE_CONFIGURATION: fedora38_makefiles_clang CMAKE_GENERATOR: "Unix Makefiles" -.fedora37_ninja_clang: - extends: .fedora37 +.fedora38_ninja_clang: + extends: .fedora38 variables: - CMAKE_CONFIGURATION: fedora37_ninja_clang + CMAKE_CONFIGURATION: fedora38_ninja_clang ### Sanitizers @@ -226,13 +226,13 @@ CTEST_MEMORYCHECK_TYPE: AddressSanitizer CTEST_MEMORYCHECK_SANITIZER_OPTIONS: "" -.fedora37_asan: +.fedora38_asan: extends: - - .fedora37 + - .fedora38 - .fedora_asan_addon variables: - CMAKE_CONFIGURATION: fedora37_asan + CMAKE_CONFIGURATION: fedora38_asan ### Intel Compiler @@ -478,7 +478,7 @@ .cmake_codespell_linux: stage: build - extends: .fedora37 + extends: .fedora38 script: - .gitlab/ci/codespell.sh interruptible: true @@ -623,7 +623,7 @@ .cmake_org_help: stage: build extends: - - .fedora37 + - .fedora38 - .linux_x86_64_tags - .cmake_org_help_artifacts script: diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml index 114808f..caa2119 100644 --- a/.gitlab/upload.yml +++ b/.gitlab/upload.yml @@ -1,7 +1,7 @@ # Steps for uploading artifacts .rsync_upload_package: - image: "fedora:37" + image: "fedora:38" stage: upload tags: - cmake @@ -21,7 +21,7 @@ .rsync_upload_help: stage: upload - image: "fedora:37" + image: "fedora:38" tags: - cmake - docker -- cgit v0.12