ci: Revert "Cover compilation with Clang on Fedora in every merge request"

Revert commit cc1f631e38 (ci: Cover compilation with Clang on Fedora in every merge request, 2026-01-13) and commit 5ccf55ffa7 (ci: Decouple Fedora+Clang common job settings from external testing, 2026-01-13). The motivation was to enable clang-specific features, but that turns out to need a separate job anyway.
2026-01-26 11:04:33 +00:00 · 2026-01-16 11:01:24 -05:00 · 2026-01-16 11:01:24 -05:00 · 5ae5cf78d2
commit 5ae5cf78d2
parent 4c8d68422b
11 changed files with 39 additions and 39 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -347,9 +347,9 @@ t:fedora43-ninja-multi:
        - .run_dependent
        - .needs_centos7_x86_64

-t:fedora43-ninja:
+t:fedora43-ninja-clang:
    extends:
-        - .fedora43_ninja
+        - .fedora43_ninja_clang
        - .cmake_test_linux_release
        - .linux_x86_64_tags
        - .run_dependent
@ -635,9 +635,9 @@ t:debian10-legacy:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-b:fedora43-ninja-clang:
+b:fedora43-ninja:
    extends:
-        - .fedora43_ninja_clang
+        - .fedora43_ninja
        - .cmake_build_linux
        - .cmake_build_artifacts
        - .linux_x86_64_tags
@ -691,15 +691,15 @@ b:fedora43-extdeps:
    variables:
        CMAKE_CI_JOB_NIGHTLY: "true"

-t:fedora43-ninja-clang:
+t:fedora43-ninja:
    extends:
-        - .fedora43_ninja_clang
+        - .fedora43_ninja
        - .cmake_test_linux
        - .linux_x86_64_tags_x11
        - .cmake_test_artifacts
        - .run_dependent
    needs:
-        - b:fedora43-ninja-clang
+        - b:fedora43-ninja
    variables:
        CMAKE_CI_JOB_CONTINUOUS: "true"

--- a/.gitlab/ci/configure_fedora43_common_clang.cmake
+++ b/.gitlab/ci/configure_fedora43_common_clang.cmake
@ -13,3 +13,5 @@ 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 "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
--- a/.gitlab/ci/configure_fedora43_makefiles_clang.cmake
+++ b/.gitlab/ci/configure_fedora43_makefiles_clang.cmake
@ -3,4 +3,3 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
 endif()

 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_clang.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
--- a/.gitlab/ci/configure_fedora43_ninja.cmake
+++ b/.gitlab/ci/configure_fedora43_ninja.cmake
@ -1,3 +1,22 @@
+set(CMake_TEST_GUI "ON" CACHE BOOL "")
+if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
+  set(CMake_TEST_CPACK_APPIMAGE "ON" CACHE STRING "")
+  set(CMake_TEST_CPACK_APPIMAGE_RUNTIME_FILE "$ENV{CI_PROJECT_DIR}/.gitlab/appimagetool/lib/appimagetool/runtime" CACHE FILEPATH "")
+  set(CMake_TEST_ISPC "ON" CACHE STRING "")
+endif()
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "")
+set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "")
+set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "")
+set(CMake_TEST_TLS_VERSION "1.3" CACHE STRING "")
+set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" CACHE STRING "")

-include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
+# "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 "")
+# Qt 6 requires C++17, so use Qt 5.
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
--- a/.gitlab/ci/configure_fedora43_ninja_clang.cmake
+++ b/.gitlab/ci/configure_fedora43_ninja_clang.cmake
@ -1,23 +1,3 @@
-set(CMake_TEST_GUI "ON" CACHE BOOL "")
-if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
-  set(CMake_TEST_CPACK_APPIMAGE "ON" CACHE STRING "")
-  set(CMake_TEST_CPACK_APPIMAGE_RUNTIME_FILE "$ENV{CI_PROJECT_DIR}/.gitlab/appimagetool/lib/appimagetool/runtime" CACHE FILEPATH "")
-  set(CMake_TEST_ISPC "ON" CACHE STRING "")
-endif()
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database,import_std23" CACHE STRING "")
-set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "")
-set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "")
-set(CMake_TEST_TLS_VERSION "1.3" CACHE STRING "")
-set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" 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 "")
-# Qt 6 requires C++17, so use Qt 5.
-set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")

 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_clang.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
--- a/.gitlab/ci/configure_fedora43_ninja_multi_clang.cmake
+++ b/.gitlab/ci/configure_fedora43_ninja_multi_clang.cmake
@ -1,4 +1,3 @@
 set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database" CACHE STRING "")

 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_clang.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
--- a/.gitlab/ci/configure_fedora43_ninja_valgrind.cmake
+++ b/.gitlab/ci/configure_fedora43_ninja_valgrind.cmake
@ -3,3 +3,4 @@ set(CMake_TEST_Qt6 ON CACHE BOOL "")

 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_valgrind.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_ninja.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
--- a/.gitlab/ci/env_fedora43_ninja.sh
+++ b/.gitlab/ci/env_fedora43_ninja.sh
@ -0,0 +1,4 @@
+if test "$CMAKE_CI_NIGHTLY" = "true"; then
+  source .gitlab/ci/appimagetool-env.sh
+  source .gitlab/ci/ispc-env.sh
+fi
--- a/.gitlab/ci/env_fedora43_ninja_clang.sh
+++ b/.gitlab/ci/env_fedora43_ninja_clang.sh
@ -1,6 +1 @@
-if test "$CMAKE_CI_NIGHTLY" = "true"; then
-  source .gitlab/ci/appimagetool-env.sh
-  source .gitlab/ci/ispc-env.sh
-fi
-
 . .gitlab/ci/env_fedora43_common_clang.sh
--- a/.gitlab/ci/env_fedora43_ninja_valgrind.sh
+++ b/.gitlab/ci/env_fedora43_ninja_valgrind.sh
@ -0,0 +1 @@
+source .gitlab/ci/env_fedora43_ninja.sh
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@ -227,11 +227,11 @@
        CMAKE_CI_BUILD_TYPE: Release
        CTEST_NO_WARNINGS_ALLOWED: 1

-.fedora43_ninja_clang:
+.fedora43_ninja:
    extends: .fedora43

    variables:
-        CMAKE_CONFIGURATION: fedora43_ninja_clang
+        CMAKE_CONFIGURATION: fedora43_ninja
        CMAKE_CI_BUILD_TYPE: Release
        CTEST_NO_WARNINGS_ALLOWED: 1

@ -309,11 +309,11 @@
        CMAKE_CONFIGURATION: fedora43_ninja_multi
        CMAKE_GENERATOR: "Ninja Multi-Config"

-.fedora43_ninja:
+.fedora43_ninja_clang:
    extends: .fedora43

    variables:
-        CMAKE_CONFIGURATION: fedora43_ninja
+        CMAKE_CONFIGURATION: fedora43_ninja_clang

 .fedora43_ninja_multi_clang:
    extends: .fedora43