From 061f7d5ca396babb8488ea523f14a3cd64a22892 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 12 Nov 2020 09:44:32 -0500 Subject: gitlab-ci: update Linux CI to use Fedora 33 --- .gitlab-ci.yml | 34 +++++------ .gitlab/ci/configure_fedora31_common.cmake | 5 -- .gitlab/ci/configure_fedora31_makefiles.cmake | 66 ---------------------- .gitlab/ci/configure_fedora31_ninja.cmake | 7 --- .gitlab/ci/configure_fedora31_ninja_multi.cmake | 2 - .gitlab/ci/configure_fedora31_sphinx.cmake | 2 - .gitlab/ci/configure_fedora31_sphinx_package.cmake | 13 ----- .gitlab/ci/configure_fedora31_tidy.cmake | 3 - .gitlab/ci/configure_fedora33_common.cmake | 5 ++ .gitlab/ci/configure_fedora33_makefiles.cmake | 66 ++++++++++++++++++++++ .gitlab/ci/configure_fedora33_ninja.cmake | 7 +++ .gitlab/ci/configure_fedora33_ninja_multi.cmake | 2 + .gitlab/ci/configure_fedora33_sphinx.cmake | 2 + .gitlab/ci/configure_fedora33_sphinx_package.cmake | 13 +++++ .gitlab/ci/configure_fedora33_tidy.cmake | 3 + .gitlab/ci/env_fedora31_makefiles.cmake | 2 - .gitlab/ci/env_fedora33_makefiles.cmake | 2 + .gitlab/os-linux.yml | 40 ++++++------- 18 files changed, 137 insertions(+), 137 deletions(-) delete mode 100644 .gitlab/ci/configure_fedora31_common.cmake delete mode 100644 .gitlab/ci/configure_fedora31_makefiles.cmake delete mode 100644 .gitlab/ci/configure_fedora31_ninja.cmake delete mode 100644 .gitlab/ci/configure_fedora31_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_fedora31_sphinx.cmake delete mode 100644 .gitlab/ci/configure_fedora31_sphinx_package.cmake delete mode 100644 .gitlab/ci/configure_fedora31_tidy.cmake create mode 100644 .gitlab/ci/configure_fedora33_common.cmake create mode 100644 .gitlab/ci/configure_fedora33_makefiles.cmake create mode 100644 .gitlab/ci/configure_fedora33_ninja.cmake create mode 100644 .gitlab/ci/configure_fedora33_ninja_multi.cmake create mode 100644 .gitlab/ci/configure_fedora33_sphinx.cmake create mode 100644 .gitlab/ci/configure_fedora33_sphinx_package.cmake create mode 100644 .gitlab/ci/configure_fedora33_tidy.cmake delete mode 100644 .gitlab/ci/env_fedora31_makefiles.cmake create mode 100644 .gitlab/ci/env_fedora33_makefiles.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eda96ae..5550c2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ prep:source-package: prep:doc-package: extends: - - .fedora31_sphinx_package + - .fedora33_sphinx_package - .cmake_prep_doc_linux - .linux_builder_tags_qt - .cmake_doc_artifacts @@ -72,16 +72,16 @@ build:debian10-iwyu: - .linux_builder_tags - .run_automatically -build:fedora31-tidy: +build:fedora33-tidy: extends: - - .fedora31_tidy + - .fedora33_tidy - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically -build:fedora31-sphinx: +build:fedora33-sphinx: extends: - - .fedora31_sphinx + - .fedora33_sphinx - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically @@ -110,9 +110,9 @@ test:debian10-ninja: needs: - build:centos6-release -test:fedora31-makefiles: +test:fedora33-makefiles: extends: - - .fedora31_makefiles + - .fedora33_makefiles - .cmake_test_linux_package - .linux_builder_tags_qt - .run_dependent @@ -132,36 +132,36 @@ test:cuda10.2-nvidia: needs: - build:centos6-release -build:fedora31-ninja: +build:fedora33-ninja: extends: - - .fedora31_ninja + - .fedora33_ninja - .cmake_build_linux - .cmake_build_artifacts - .linux_builder_tags_qt - .run_manually -test:fedora31-ninja: +test:fedora33-ninja: extends: - - .fedora31_ninja + - .fedora33_ninja - .cmake_test_linux - .linux_builder_tags_x11 - .cmake_test_artifacts - .run_dependent dependencies: - - build:fedora31-ninja + - build:fedora33-ninja needs: - - build:fedora31-ninja + - build:fedora33-ninja -test:fedora31-ninja-multi: +test:fedora33-ninja-multi: extends: - - .fedora31_ninja_multi + - .fedora33_ninja_multi - .cmake_test_linux_external - .linux_builder_tags_qt - .run_dependent dependencies: - - test:fedora31-ninja + - test:fedora33-ninja needs: - - test:fedora31-ninja + - test:fedora33-ninja build:linux-x86_64-package: extends: diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora31_common.cmake deleted file mode 100644 index c343833..0000000 --- a/.gitlab/ci/configure_fedora31_common.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(BUILD_CursesDialog ON CACHE BOOL "") -set(BUILD_QtDialog ON CACHE BOOL "") -set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora31_makefiles.cmake deleted file mode 100644 index 8d2454f..0000000 --- a/.gitlab/ci/configure_fedora31_makefiles.cmake +++ /dev/null @@ -1,66 +0,0 @@ -set(CMake_TEST_FindALSA "ON" CACHE BOOL "") -set(CMake_TEST_FindBLAS "ON" CACHE BOOL "") -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_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_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_FindJPEG "ON" CACHE BOOL "") -set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") -set(CMake_TEST_FindLAPACK "ON" CACHE BOOL "") -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_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_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora31_ninja.cmake deleted file mode 100644 index ea429c1..0000000 --- a/.gitlab/ci/configure_fedora31_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_fedora31_common.cmake") diff --git a/.gitlab/ci/configure_fedora31_ninja_multi.cmake b/.gitlab/ci/configure_fedora31_ninja_multi.cmake deleted file mode 100644 index efb4b84..0000000 --- a/.gitlab/ci/configure_fedora31_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_fedora31_sphinx.cmake b/.gitlab/ci/configure_fedora31_sphinx.cmake deleted file mode 100644 index 90d159b..0000000 --- a/.gitlab/ci/configure_fedora31_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_fedora31_sphinx_package.cmake b/.gitlab/ci/configure_fedora31_sphinx_package.cmake deleted file mode 100644 index e839de8..0000000 --- a/.gitlab/ci/configure_fedora31_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_fedora31_tidy.cmake b/.gitlab/ci/configure_fedora31_tidy.cmake deleted file mode 100644 index 55d022c..0000000 --- a/.gitlab/ci/configure_fedora31_tidy.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake") diff --git a/.gitlab/ci/configure_fedora33_common.cmake b/.gitlab/ci/configure_fedora33_common.cmake new file mode 100644 index 0000000..c343833 --- /dev/null +++ b/.gitlab/ci/configure_fedora33_common.cmake @@ -0,0 +1,5 @@ +set(BUILD_CursesDialog ON CACHE BOOL "") +set(BUILD_QtDialog ON CACHE BOOL "") +set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora33_makefiles.cmake b/.gitlab/ci/configure_fedora33_makefiles.cmake new file mode 100644 index 0000000..8d2454f --- /dev/null +++ b/.gitlab/ci/configure_fedora33_makefiles.cmake @@ -0,0 +1,66 @@ +set(CMake_TEST_FindALSA "ON" CACHE BOOL "") +set(CMake_TEST_FindBLAS "ON" CACHE BOOL "") +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_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_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_FindJPEG "ON" CACHE BOOL "") +set(CMake_TEST_FindJsonCpp "ON" CACHE BOOL "") +set(CMake_TEST_FindLAPACK "ON" CACHE BOOL "") +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_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_fedora33_ninja.cmake b/.gitlab/ci/configure_fedora33_ninja.cmake new file mode 100644 index 0000000..883f425 --- /dev/null +++ b/.gitlab/ci/configure_fedora33_ninja.cmake @@ -0,0 +1,7 @@ +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_fedora33_common.cmake") diff --git a/.gitlab/ci/configure_fedora33_ninja_multi.cmake b/.gitlab/ci/configure_fedora33_ninja_multi.cmake new file mode 100644 index 0000000..efb4b84 --- /dev/null +++ b/.gitlab/ci/configure_fedora33_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_fedora33_sphinx.cmake b/.gitlab/ci/configure_fedora33_sphinx.cmake new file mode 100644 index 0000000..90d159b --- /dev/null +++ b/.gitlab/ci/configure_fedora33_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_fedora33_sphinx_package.cmake b/.gitlab/ci/configure_fedora33_sphinx_package.cmake new file mode 100644 index 0000000..e839de8 --- /dev/null +++ b/.gitlab/ci/configure_fedora33_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_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake new file mode 100644 index 0000000..9052fdc --- /dev/null +++ b/.gitlab/ci/configure_fedora33_tidy.cmake @@ -0,0 +1,3 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake") diff --git a/.gitlab/ci/env_fedora31_makefiles.cmake b/.gitlab/ci/env_fedora31_makefiles.cmake deleted file mode 100644 index 1d0efa7..0000000 --- a/.gitlab/ci/env_fedora31_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/openmpi/bin:$ENV{PATH}") diff --git a/.gitlab/ci/env_fedora33_makefiles.cmake b/.gitlab/ci/env_fedora33_makefiles.cmake new file mode 100644 index 0000000..1d0efa7 --- /dev/null +++ b/.gitlab/ci/env_fedora33_makefiles.cmake @@ -0,0 +1,2 @@ +set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0") +set(ENV{PATH} "/usr/lib64/openmpi/bin:$ENV{PATH}") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 4e8fb80..3808020 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -48,36 +48,36 @@ ### Fedora -.fedora31: - image: "kitware/cmake:ci-fedora31-x86_64-2020-10-22" +.fedora33: + image: "kitware/cmake:ci-fedora33-x86_64-2020-11-13" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" #### Lint builds -.fedora31_tidy: - extends: .fedora31 +.fedora33_tidy: + extends: .fedora33 variables: - CMAKE_CONFIGURATION: fedora31_tidy + CMAKE_CONFIGURATION: fedora33_tidy CTEST_NO_WARNINGS_ALLOWED: 1 CMake_SKIP_INSTALL: 1 -.fedora31_sphinx: - extends: .fedora31 +.fedora33_sphinx: + extends: .fedora33 variables: - CMAKE_CONFIGURATION: fedora31_sphinx + CMAKE_CONFIGURATION: fedora33_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" CMake_SKIP_INSTALL: 1 -.fedora31_sphinx_package: - extends: .fedora31 +.fedora33_sphinx_package: + extends: .fedora33 variables: - CMAKE_CONFIGURATION: fedora31_sphinx_package + CMAKE_CONFIGURATION: fedora33_sphinx_package CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" #### Build and test @@ -89,26 +89,26 @@ CMAKE_CONFIGURATION: debian10_ninja CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora31_ninja: - extends: .fedora31 +.fedora33_ninja: + extends: .fedora33 variables: - CMAKE_CONFIGURATION: fedora31_ninja + CMAKE_CONFIGURATION: fedora33_ninja CTEST_NO_WARNINGS_ALLOWED: 1 -.fedora31_ninja_multi: - extends: .fedora31 +.fedora33_ninja_multi: + extends: .fedora33 variables: - CMAKE_CONFIGURATION: fedora31_ninja_multi + CMAKE_CONFIGURATION: fedora33_ninja_multi CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Ninja Multi-Config" -.fedora31_makefiles: - extends: .fedora31 +.fedora33_makefiles: + extends: .fedora33 variables: - CMAKE_CONFIGURATION: fedora31_makefiles + CMAKE_CONFIGURATION: fedora33_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" -- cgit v0.12