Merge topic 'ci-fedora-43' into release-4.2

2338d987d5 ci: use Fedora 43 images and environments
5219f383fe ci: update Fedora base images to Fedora 43
373e8ea652 clang-tidy: ignore warnings new in version 21
e12ce158bc clang-tidy: fix bugprone-unintended-char-ostream-output lint
2ca11db2e3 pre-commit: version bump `typos` hook plus fix found typos
d314d85ea5 Tests: Extend RunCMake.ParseImplicitLinkInfo for LLVMFlang 21.1.3
b7ad081f1a Tests: Fix RunCMake.CXXModules compilation with Clang 21

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11375
This commit is contained in:
Brad King
2025-10-31 07:12:26 -04:00
committed by Kitware Robot
94 changed files with 259 additions and 186 deletions
+2
View File
@@ -36,6 +36,7 @@ modernize-*,\
-modernize-use-emplace,\
-modernize-use-nodiscard,\
-modernize-use-noexcept,\
-modernize-use-scoped-lock,\
-modernize-use-trailing-return-type,\
-modernize-use-transparent-functors,\
performance-*,\
@@ -62,6 +63,7 @@ readability-*,\
-readability-static-accessed-through-instance,\
-readability-suspicious-call-argument,\
-readability-uppercase-literal-suffix,\
-readability-use-concise-preprocessor-directives,\
-readability-use-std-min-max,\
cmake-*,\
-cmake-ostringstream-use-cmstrcat,\
+66 -66
View File
@@ -62,7 +62,7 @@ p:source-package:
p:doc-package:
extends:
- .fedora42_sphinx_package
- .fedora43_sphinx_package
- .cmake_prep_doc_linux
- .linux_x86_64_tags
- .cmake_doc_artifacts
@@ -112,18 +112,18 @@ l:iwyu-debian12:
- .cmake_cdash_artifacts
- .run_automatically
l:tidy-fedora42:
l:tidy-fedora43:
extends:
- .fedora42_tidy
- .fedora43_tidy
- .cmake_build_linux
- .cmake_tidy_artifacts
- .linux_x86_64_tags
- .cmake_cdash_artifacts
- .run_automatically
l:sphinx-fedora42:
l:sphinx-fedora43:
extends:
- .fedora42_sphinx
- .fedora43_sphinx
- .cmake_build_linux
- .cmake_sphinx_artifacts
- .linux_x86_64_tags
@@ -132,27 +132,27 @@ l:sphinx-fedora42:
CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_HELP: "true"
l:clang-analyzer-fedora42:
l:clang-analyzer-fedora43:
extends:
- .fedora42_clang_analyzer
- .fedora43_clang_analyzer
- .cmake_build_linux
- .linux_x86_64_tags
- .run_automatically
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
l:clazy-fedora42:
l:clazy-fedora43:
extends:
- .fedora42_clazy
- .fedora43_clazy
- .cmake_build_linux
- .linux_x86_64_tags
- .run_automatically
# Coverage builds
b:fedora42-gcc-gcov:
b:fedora43-gcc-gcov:
extends:
- .fedora42_gcc_gcov
- .fedora43_gcc_gcov
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -160,9 +160,9 @@ b:fedora42-gcc-gcov:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-gcc-gcov:
t:fedora43-gcc-gcov:
extends:
- .fedora42_gcc_gcov
- .fedora43_gcc_gcov
- .cmake_test_linux
- .cmake_coverage_artifacts
- .linux_x86_64_tags_x11
@@ -170,25 +170,25 @@ t:fedora42-gcc-gcov:
# Run coverage analysis even if the tests fail.
allow_failure: true
needs:
- b:fedora42-gcc-gcov
- b:fedora43-gcc-gcov
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
a:fedora42-gcc-gcov:
a:fedora43-gcc-gcov:
extends:
- .fedora42_gcc_gcov
- .fedora43_gcc_gcov
- .cmake_coverage_linux
- .cmake_cdash_artifacts
- .linux_x86_64_tags
- .run_dependent
needs:
- t:fedora42-gcc-gcov
- t:fedora43-gcc-gcov
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora42-bullseye-coverage:
b:fedora43-bullseye-coverage:
extends:
- .fedora42_bullseye_coverage
- .fedora43_bullseye_coverage
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -196,9 +196,9 @@ b:fedora42-bullseye-coverage:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-bullseye-coverage:
t:fedora43-bullseye-coverage:
extends:
- .fedora42_bullseye_coverage
- .fedora43_bullseye_coverage
- .cmake_test_linux
- .cmake_coverage_artifacts
- .linux_x86_64_tags_x11
@@ -206,19 +206,19 @@ t:fedora42-bullseye-coverage:
# Run coverage analysis even if the tests fail.
allow_failure: true
needs:
- b:fedora42-bullseye-coverage
- b:fedora43-bullseye-coverage
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
a:fedora42-bullseye-coverage:
a:fedora43-bullseye-coverage:
extends:
- .fedora42_bullseye_coverage
- .fedora43_bullseye_coverage
- .cmake_coverage_linux
- .cmake_cdash_artifacts
- .linux_x86_64_tags
- .run_dependent
needs:
- t:fedora42-bullseye-coverage
- t:fedora43-bullseye-coverage
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
@@ -309,9 +309,9 @@ t:debian12-hip-radeon:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-hip-radeon:
t:fedora43-hip-radeon:
extends:
- .fedora42_hip_radeon
- .fedora43_hip_radeon
- .cmake_test_linux_release
- .linux_x86_64_tags_rocm6.2
- .run_dependent
@@ -319,9 +319,9 @@ t:fedora42-hip-radeon:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-makefiles-lfortran:
t:fedora43-makefiles-lfortran:
extends:
- .fedora42_makefiles_lfortran
- .fedora43_makefiles_lfortran
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -329,9 +329,9 @@ t:fedora42-makefiles-lfortran:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-ninja-lfortran:
t:fedora43-ninja-lfortran:
extends:
- .fedora42_ninja_lfortran
- .fedora43_ninja_lfortran
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -339,9 +339,9 @@ t:fedora42-ninja-lfortran:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-ninja-clang:
t:fedora43-ninja-clang:
extends:
- .fedora42_ninja_clang
- .fedora43_ninja_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -349,9 +349,9 @@ t:fedora42-ninja-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-ninja-multi-clang:
t:fedora43-ninja-multi-clang:
extends:
- .fedora42_ninja_multi_clang
- .fedora43_ninja_multi_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -359,9 +359,9 @@ t:fedora42-ninja-multi-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-makefiles-clang:
t:fedora43-makefiles-clang:
extends:
- .fedora42_makefiles_clang
- .fedora43_makefiles_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@@ -369,17 +369,17 @@ t:fedora42-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-makefiles:
t:fedora43-makefiles:
extends:
- .fedora42_makefiles
- .fedora43_makefiles
- .cmake_test_linux_release
- .linux_x86_64_v3_tags
- .run_dependent
- .needs_centos7_x86_64
t:fedora42-makefiles-nospace:
t:fedora43-makefiles-nospace:
extends:
- .fedora42_makefiles
- .fedora43_makefiles
- .cmake_test_linux_release
- .linux_x86_64_v3_tags
- .cmake_junit_artifacts
@@ -387,12 +387,12 @@ t:fedora42-makefiles-nospace:
- .needs_centos7_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CI_BUILD_NAME: fedora42_makefiles_nospace
CMAKE_CI_BUILD_NAME: fedora43_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-fastbuild:
t:fedora43-fastbuild:
extends:
- .fedora42_fastbuild
- .fedora43_fastbuild
- .cmake_test_linux_release
- .linux_x86_64_v3_tags
- .run_dependent
@@ -616,9 +616,9 @@ t:debian10-legacy:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora42-ninja:
b:fedora43-ninja:
extends:
- .fedora42_ninja
- .fedora43_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -626,9 +626,9 @@ b:fedora42-ninja:
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
b:fedora42-makefiles-symlinked:
b:fedora43-makefiles-symlinked:
extends:
- .fedora42_makefiles_symlinked
- .fedora43_makefiles_symlinked
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -663,48 +663,48 @@ b:debian12-aarch64-extdeps:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora42-extdeps:
b:fedora43-extdeps:
extends:
- .fedora42_extdeps
- .fedora43_extdeps
- .cmake_build_linux_standalone
- .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-ninja:
t:fedora43-ninja:
extends:
- .fedora42_ninja
- .fedora43_ninja
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
needs:
- b:fedora42-ninja
- b:fedora43-ninja
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
t:fedora42-makefiles-symlinked:
t:fedora43-makefiles-symlinked:
extends:
- .fedora42_makefiles_symlinked
- .fedora43_makefiles_symlinked
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
needs:
- b:fedora42-makefiles-symlinked
- b:fedora43-makefiles-symlinked
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-ninja-multi:
t:fedora43-ninja-multi:
extends:
- .fedora42_ninja_multi
- .fedora43_ninja_multi
- .cmake_test_linux_external
- .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
needs:
- t:fedora42-ninja
- t:fedora43-ninja
t:intel2016u2-makefiles:
extends:
@@ -1019,9 +1019,9 @@ u:sunos-sparc64-package:
## Sanitizer builds
b:fedora42-asan:
b:fedora43-asan:
extends:
- .fedora42_asan
- .fedora43_asan
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@@ -1029,21 +1029,21 @@ b:fedora42-asan:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-asan:
t:fedora43-asan:
extends:
- .fedora42_asan
- .fedora43_asan
- .cmake_memcheck_linux
- .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
needs:
- b:fedora42-asan
- b:fedora43-asan
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora42-ninja-valgrind:
t:fedora43-ninja-valgrind:
extends:
- .fedora42_ninja_valgrind
- .fedora43_ninja_valgrind
- .cmake_test_linux_release
# Use a fast CPU so that timeouts are less of a concern.
- .linux_x86_64_tags_fast_x11
@@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_lfortran.cmake")
@@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_lfortran.cmake")
@@ -2,4 +2,4 @@ set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "")
set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -18,4 +18,4 @@ set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STR
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_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -1,4 +1,4 @@
set(configure_no_sccache 1)
set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -2,4 +2,4 @@ set(configure_no_sccache 1)
set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
set(CMAKE_USE_SYSTEM_JSONCPP ON CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -1,4 +1,4 @@
set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "")
set(CMAKE_Fortran_COMPILER "/usr/bin/flang-21" CACHE FILEPATH "")
set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "")
set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "")
@@ -38,4 +38,4 @@ set(CMAKE_MODULE_LINKER_FLAGS_INIT "${link_flags}" CACHE STRING "")
# Do not bootstrap for the coverage test suite.
set(CMAKE_SKIP_BOOTSTRAP_TEST TRUE CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -1,7 +1,11 @@
set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "")
set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "")
set(CMake_TEST_CTestUpdate_BZR "ON" CACHE BOOL "")
# FIXME(Fedora): Breezy crashes in Fedora 43
# https://bugs.launchpad.net/brz/+bug/2121688
# https://bugzilla.redhat.com/show_bug.cgi?id=2366194
set(CMake_TEST_CTestUpdate_BZR "OFF" 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 "")
@@ -2,4 +2,4 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_clang.cmake")
@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_lfortran.cmake")
@@ -2,4 +2,4 @@ set(CMake_QT_MAJOR_VERSION "6" CACHE STRING "")
set(CMake_TEST_GUI "ON" CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -19,4 +19,4 @@ 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_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -1,3 +1,3 @@
set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database,import_std23" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_clang.cmake")
@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_lfortran.cmake")
@@ -1,3 +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_fedora42_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common_clang.cmake")
@@ -1,6 +1,6 @@
set(CMake_TEST_Qt5 ON CACHE BOOL "")
set(CMake_TEST_Qt6 ON CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_valgrind.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_ninja.cmake")
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")
@@ -4,4 +4,4 @@ set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/buil
set(CMake_CLANG_TIDY_EXPORT_FIXES_DIR "$ENV{CI_PROJECT_DIR}/.gitlab/clang-tidy-fixes" CACHE PATH "")
set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora43_common.cmake")
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE=fedora:42
ARG BASE_IMAGE=fedora:43
FROM ${BASE_IMAGE} AS dnf-cache
LABEL maintainer="Brad King <brad.king@kitware.com>"
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE=fedora:42
ARG BASE_IMAGE=fedora:43
FROM ${BASE_IMAGE} AS dnf-cache
# Populate DNF cache w/ the fresh metadata and prefetch packages.
@@ -2,7 +2,7 @@
set -e
typos_version=1.36.1
typos_version=1.38.1
cargo install --root /usr/local --version "$typos_version" typos-cli
strip /usr/local/bin/typos
@@ -5,6 +5,6 @@ set -e
dnf install -y $(grep '^[^#]\+$' /root/deps_packages.lst)
# Remove tests for Python packages
for v in 3.13; do
for v in 3.14; do
find /usr/lib64/python${v}/site-packages -type d -a -name tests -exec rm -rf {} +
done
-3
View File
@@ -1,3 +0,0 @@
export CC=/usr/bin/clang-20
export CXX=/usr/bin/clang++-20
export FC=/usr/bin/flang-20
-2
View File
@@ -1,2 +0,0 @@
export HIPCXX=/usr/bin/clang++-20
export HIPFLAGS='--rocm-path=/usr --rocm-device-lib-path=/usr/lib64/rocm/llvm/lib/clang/18/amdgcn/bitcode'
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora42_common_clang.sh
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora42_common_lfortran.sh
@@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/env_fedora42_makefiles.cmake")
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora42_makefiles.sh
-1
View File
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora42_common_clang.sh
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora42_common_lfortran.sh
@@ -1 +0,0 @@
. .gitlab/ci/env_fedora42_common_clang.sh
@@ -1 +0,0 @@
source .gitlab/ci/env_fedora42_ninja.sh
@@ -1,6 +1,6 @@
export CC=/usr/bin/clang
export CXX=/usr/bin/clazy
export CLANGXX=/usr/bin/clang++
export CLANGXX=/usr/bin/clang++-20
export CLAZY_CHECKS="level2\
,no-base-class-event\
+9
View File
@@ -0,0 +1,9 @@
export CC=/usr/bin/clang-21
export CXX=/usr/bin/clang++-21
export FC=/usr/bin/flang-21
# FIXME(Fedora): Flang 21 packages do not make the runtime library findable.
# https://github.com/llvm/llvm-project/issues/138340
# https://bugzilla.redhat.com/show_bug.cgi?id=2401176
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1117534
export LD_LIBRARY_PATH=/usr/lib/clang/21/lib/x86_64-redhat-linux-gnu
+2
View File
@@ -0,0 +1,2 @@
export HIPCXX=/usr/bin/clang++-21
export HIPFLAGS='--rocm-path=/usr --rocm-device-lib-path=/usr/lib64/rocm/llvm/lib/clang/19/amdgcn/bitcode'
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora43_common_clang.sh
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora43_common_lfortran.sh
@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/env_fedora43_makefiles.cmake")
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora43_makefiles.sh
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora43_common_clang.sh
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora43_common_lfortran.sh
@@ -0,0 +1 @@
. .gitlab/ci/env_fedora43_common_clang.sh
@@ -0,0 +1 @@
source .gitlab/ci/env_fedora43_ninja.sh
+72 -72
View File
@@ -5,7 +5,7 @@
### Release
.linux_prep_source:
image: "fedora:42"
image: "fedora:43"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -82,15 +82,15 @@
### Fedora
.fedora42:
image: "kitware/cmake:ci-fedora42-x86_64-2025-09-29"
.fedora43:
image: "kitware/cmake:ci-fedora43-x86_64-2025-10-29"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
CMAKE_ARCH: x86_64
.fedora42_hip:
image: "kitware/cmake:ci-fedora42-hip-x86_64-2025-04-22"
.fedora43_hip:
image: "kitware/cmake:ci-fedora43-hip-x86_64-2025-10-29"
variables:
# FIXME(rocclr): device modules fail loading from binaries in paths with spaces
@@ -99,26 +99,26 @@
#### Coverage builds
.fedora42_gcc_gcov:
extends: .fedora42
.fedora43_gcc_gcov:
extends: .fedora43
variables:
# See issue #20001
CMAKE_GENERATOR: "Unix Makefiles"
CMAKE_CONFIGURATION: fedora42_gcc_gcov
CMAKE_CONFIGURATION: fedora43_gcc_gcov
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_BUILD_TYPE: Debug
CMAKE_CI_TEST_TIMEOUT: "1500"
CMAKE_CI_NO_INSTALL: 1
.fedora42_bullseye_coverage:
extends: .fedora42
.fedora43_bullseye_coverage:
extends: .fedora43
environment:
name: bullseye-coverage
variables:
# See issue #20001
CMAKE_GENERATOR: "Unix Makefiles"
CMAKE_CONFIGURATION: fedora42_bullseye_coverage
CMAKE_CONFIGURATION: fedora43_bullseye_coverage
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_BUILD_TYPE: Debug
CMAKE_CI_TEST_TIMEOUT: "1500"
@@ -126,45 +126,45 @@
#### Lint builds
.fedora42_tidy:
extends: .fedora42
.fedora43_tidy:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_tidy
CMAKE_CONFIGURATION: fedora43_tidy
CMAKE_CI_NO_INSTALL: 1
.fedora42_clang_analyzer:
extends: .fedora42
.fedora43_clang_analyzer:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_clang_analyzer
CMAKE_CONFIGURATION: fedora43_clang_analyzer
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
.fedora42_clazy:
extends: .fedora42
.fedora43_clazy:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_clazy
CMAKE_CONFIGURATION: fedora43_clazy
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
.fedora42_sphinx:
extends: .fedora42
.fedora43_sphinx:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_sphinx
CMAKE_CONFIGURATION: fedora43_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMAKE_CI_NO_INSTALL: 1
.fedora42_sphinx_package:
extends: .fedora42
.fedora43_sphinx_package:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_sphinx_package
CMAKE_CONFIGURATION: fedora43_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@@ -220,53 +220,53 @@
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora42_extdeps:
extends: .fedora42
.fedora43_extdeps:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_extdeps
CMAKE_CONFIGURATION: fedora43_extdeps
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora42_ninja:
extends: .fedora42
.fedora43_ninja:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_ninja
CMAKE_CONFIGURATION: fedora43_ninja
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora42_ninja_multi:
extends: .fedora42
.fedora43_ninja_multi:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_ninja_multi
CMAKE_CONFIGURATION: fedora43_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
.fedora42_makefiles:
extends: .fedora42
.fedora43_makefiles:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_makefiles
CMAKE_CONFIGURATION: fedora43_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
.fedora42_makefiles_symlinked:
extends: .fedora42
.fedora43_makefiles_symlinked:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_makefiles_symlinked
CMAKE_CONFIGURATION: fedora43_makefiles_symlinked
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
CMAKE_CI_IN_SYMLINK_TREE: 1
CMAKE_CI_BUILD_DIR: "real_work/work/build"
.fedora42_fastbuild:
extends: .fedora42
.fedora43_fastbuild:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_fastbuild
CMAKE_CONFIGURATION: fedora43_fastbuild
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "FASTBuild"
@@ -285,43 +285,43 @@
variables:
CMAKE_CONFIGURATION: debian12_ninja_clang
.fedora42_makefiles_clang:
extends: .fedora42
.fedora43_makefiles_clang:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_makefiles_clang
CMAKE_CONFIGURATION: fedora43_makefiles_clang
CMAKE_GENERATOR: "Unix Makefiles"
.fedora42_makefiles_lfortran:
extends: .fedora42
.fedora43_makefiles_lfortran:
extends: .fedora43
variables:
# FIXME(lfortran): -rpath flags with spaces not forwarded
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CONFIGURATION: fedora42_makefiles_lfortran
CMAKE_CONFIGURATION: fedora43_makefiles_lfortran
CMAKE_GENERATOR: "Unix Makefiles"
CTEST_LABELS: "Fortran"
.fedora42_ninja_lfortran:
extends: .fedora42
.fedora43_ninja_lfortran:
extends: .fedora43
variables:
# FIXME(lfortran): -rpath flags with spaces not forwarded
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CONFIGURATION: fedora42_ninja_lfortran
CMAKE_CONFIGURATION: fedora43_ninja_lfortran
CTEST_LABELS: "Fortran"
.fedora42_ninja_clang:
extends: .fedora42
.fedora43_ninja_clang:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_ninja_clang
CMAKE_CONFIGURATION: fedora43_ninja_clang
.fedora42_ninja_multi_clang:
extends: .fedora42
.fedora43_ninja_multi_clang:
extends: .fedora43
variables:
CMAKE_CONFIGURATION: fedora42_ninja_multi_clang
CMAKE_CONFIGURATION: fedora43_ninja_multi_clang
CMAKE_GENERATOR: "Ninja Multi-Config"
### Sanitizers
@@ -344,24 +344,24 @@
CTEST_MEMORYCHECK_TYPE: Valgrind
CMAKE_CI_RUN_MEMCHECK: "true"
CMAKE_CI_TEST_TIMEOUT: "1500"
CMAKE_VALGRIND_CONFIGURATION: fedora42
CMAKE_VALGRIND_CONFIGURATION: fedora43
.fedora42_asan:
.fedora43_asan:
extends:
- .fedora42
- .fedora43
- .fedora_asan_addon
variables:
CMAKE_CONFIGURATION: fedora42_asan
CMAKE_CONFIGURATION: fedora43_asan
.fedora42_ninja_valgrind:
.fedora43_ninja_valgrind:
extends:
- .fedora42
- .fedora43
- .fedora_valgrind_addon
variables:
CMAKE_CONFIGURATION: fedora42_ninja_valgrind
CMAKE_CONFIGURATION: fedora43_ninja_valgrind
### Intel Compiler
@@ -558,11 +558,11 @@
CMAKE_CONFIGURATION: debian12_hip_radeon
CTEST_LABELS: "HIP"
.fedora42_hip_radeon:
extends: .fedora42_hip
.fedora43_hip_radeon:
extends: .fedora43_hip
variables:
CMAKE_CONFIGURATION: fedora42_hip_radeon
CMAKE_CONFIGURATION: fedora43_hip_radeon
CTEST_LABELS: "HIP"
.hip6.3_nvidia:
@@ -740,14 +740,14 @@
.cmake_version_update_linux:
stage: build
extends: .fedora42
extends: .fedora43
script:
- .gitlab/ci/cmake_version_update.sh
interruptible: false # The job internally fetches and retries.
.cmake_spellcheck_linux:
stage: build
extends: .fedora42
extends: .fedora43
script:
- .gitlab/ci/codespell.bash
- .gitlab/ci/typos.bash
@@ -931,7 +931,7 @@
.cmake_org_help:
stage: build
extends:
- .fedora42
- .fedora43
- .linux_x86_64_tags
- .cmake_org_help_artifacts
script:
+2 -2
View File
@@ -1,7 +1,7 @@
# Steps for uploading artifacts
.rsync_upload_package:
image: "fedora:42"
image: "fedora:43"
stage: upload
tags:
- cmake
@@ -21,7 +21,7 @@
.rsync_upload_help:
stage: upload
image: "fedora:42"
image: "fedora:43"
tags:
- cmake
- docker
+1 -1
View File
@@ -110,7 +110,7 @@ repos:
# NOTE See BUG https://github.com/crate-ci/typos/issues/390
- repo: https://github.com/adhtruong/mirrors-typos
rev: v1.36.1
rev: v1.38.1
hooks:
- id: typos
# NOTE Override hook's default args to prevent automatic
+9
View File
@@ -20,6 +20,12 @@ locale = "en-us"
# script accordingly.
#extend-ignore-identifiers-re=["\\b[0-9a-f]{8,12}\\b"]
[default.extend-identifiers]
_tru64 = "_tru64"
__tru64 = "__tru64"
__TRU64__ = "__TRU64__"
Tru64 = "Tru64"
# Add repo-wide false positives here in the form of `word = "word"`.
# Check the manual for details.
[default.extend-words]
@@ -83,6 +89,9 @@ SEH = "SEH"
[type.py.extend-identifiers]
typ = "typ"
[type.sh.extend-identifiers]
xTRUEx = "xTRUEx"
[type.rst]
extend-ignore-re = [
# NOTE Allow to mark block of text to exclude from spellchecking as RST comments
+3 -3
View File
@@ -645,7 +645,7 @@ macro(_cpack_ifw_resolve_script _variable)
endmacro()
# Resolve full path to license file
macro(_cpack_ifw_resolve_lisenses _variable)
macro(_cpack_ifw_resolve_licenses _variable)
if(${_variable})
set(_ifw_license_file FALSE)
set(_ifw_licenses_fix)
@@ -689,7 +689,7 @@ macro(cpack_ifw_configure_component compname)
cmake_parse_arguments(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME} "${_IFW_OPT}" "${_IFW_ARGS}" "${_IFW_MULTI_ARGS}" ${ARGN})
_cpack_ifw_resolve_script(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_SCRIPT)
_cpack_ifw_resolve_lisenses(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_LICENSES)
_cpack_ifw_resolve_licenses(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_LICENSES)
_cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_USER_INTERFACES)
_cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_TRANSLATIONS)
@@ -730,7 +730,7 @@ macro(cpack_ifw_configure_component_group grpname)
cmake_parse_arguments(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME} "${_IFW_OPT}" "${_IFW_ARGS}" "${_IFW_MULTI_ARGS}" ${ARGN})
_cpack_ifw_resolve_script(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_SCRIPT)
_cpack_ifw_resolve_lisenses(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_LICENSES)
_cpack_ifw_resolve_licenses(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_LICENSES)
_cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_USER_INTERFACES)
_cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_TRANSLATIONS)
+2 -2
View File
@@ -445,13 +445,13 @@ function(cpack_rpm_symlink_create_relocation_script PACKAGE_PREFIXES)
endfunction()
function(cpack_rpm_symlink_add_for_relocation_script PACKAGE_PREFIXES SYMLINK SYMLINK_RELOCATION_PATHS POINT POINT_RELOCATION_PATHS)
list(LENGTH SYMLINK_RELOCATION_PATHS SYMLINK_PATHS_COUTN)
list(LENGTH SYMLINK_RELOCATION_PATHS SYMLINK_PATHS_COUNT)
list(LENGTH POINT_RELOCATION_PATHS POINT_PATHS_COUNT)
list(APPEND _RPM_RELOCATION_SCRIPT_PAIRS "${SYMLINK}:${POINT}")
list(LENGTH _RPM_RELOCATION_SCRIPT_PAIRS PAIR_NO)
if(SYMLINK_PATHS_COUTN)
if(SYMLINK_PATHS_COUNT)
foreach(SYMLINK_RELOC_PATH IN LISTS SYMLINK_RELOCATION_PATHS)
list(FIND PACKAGE_PREFIXES "${SYMLINK_RELOC_PATH}" SYMLINK_INDEX)
+1 -1
View File
@@ -2073,7 +2073,7 @@ void cmCTestTestHandler::RecordCustomTestMeasurements(cmXMLWriter& xml,
xml.Attribute("encoding", "base64");
std::ostringstream ostr;
for (size_t cc = 0; cc < rlen; cc++) {
ostr << encoded_buffer[cc];
ostr << static_cast<char>(encoded_buffer[cc]);
if (cc % 60 == 0 && cc) {
ostr << std::endl;
}
+2 -2
View File
@@ -1698,10 +1698,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
if (ispcSuffixes.size() > 1) {
std::string rootObjectDir =
this->GeneratorTarget->GetObjectDirectory(config);
auto ispcSideEfffectObjects = detail::ComputeISPCExtraObjects(
auto ispcSideEffectObjects = detail::ComputeISPCExtraObjects(
objectName, rootObjectDir, ispcSuffixes);
for (auto sideEffect : ispcSideEfffectObjects) {
for (auto sideEffect : ispcSideEffectObjects) {
sideEffect = this->ConvertToNinjaPath(sideEffect);
objBuild.ImplicitOuts.emplace_back(sideEffect);
this->GetGlobalGenerator()->AddAdditionalCleanFile(sideEffect, config);
@@ -1,11 +1,11 @@
export module M;
#if SCANNING_CONTROL
# ifndef CMAKE_SCANNED_THIS_SOURCE
# error "This file should have been scanned"
# endif
#endif
export module M;
export int from_module()
{
return 0;
@@ -0,0 +1,47 @@
CMAKE_LANG=Fortran
CMAKE_LINKER=/usr/bin/ld
CMAKE_Fortran_COMPILER_ABI=
CMAKE_Fortran_COMPILER_AR=
CMAKE_Fortran_COMPILER_ARCHITECTURE_ID=x86_64
CMAKE_Fortran_COMPILER_EXTERNAL_TOOLCHAIN=
CMAKE_Fortran_COMPILER_ID=LLVMFlang
CMAKE_Fortran_COMPILER_LAUNCHER=
CMAKE_Fortran_COMPILER_LOADED=1
CMAKE_Fortran_COMPILER_RANLIB=
CMAKE_Fortran_COMPILER_TARGET=
CMAKE_Fortran_COMPILER_VERSION=21.1.3
CMAKE_Fortran_COMPILER_VERSION_INTERNAL=
Change Dir: '/tmp/ii/CMakeFiles/CMakeTmp'
Run Build Command(s): /tmp/CMake/bin/cmake -E env VERBOSE=1 /usr/bin/gmake -f Makefile cmTC_bffa4/fast
/usr/bin/gmake -f CMakeFiles/cmTC_bffa4.dir/build.make CMakeFiles/cmTC_bffa4.dir/build
gmake[1]: Entering directory '/tmp/ii/CMakeFiles/CMakeTmp'
Building Fortran object CMakeFiles/cmTC_bffa4.dir/CMakeFortranCompilerABI.F.o
/usr/bin/flang-21 -v -c /tmp/CMake/Modules/CMakeFortranCompilerABI.F -o CMakeFiles/cmTC_bffa4.dir/CMakeFortranCompilerABI.F.o
flang version 21.1.3 (Fedora 21.1.3-1.fc43)
Target: x86_64-redhat-linux-gnu
Thread model: posix
InstalledDir: /usr/bin
System configuration file directory: /etc/clang/
Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-redhat-linux/15
Selected GCC installation: /usr/bin/../lib/gcc/x86_64-redhat-linux/15
Candidate multilib: .@m64
Candidate multilib: 32@m32
Selected multilib: .@m64
"/usr/bin/flang" -fc1 -triple x86_64-redhat-linux-gnu -emit-obj -mrelocation-model static -target-cpu x86-64 -resource-dir /usr/bin/../lib/clang/21 -mframe-pointer=all -o CMakeFiles/cmTC_bffa4.dir/CMakeFortranCompilerABI.F.o -x f95 /tmp/CMake/Modules/CMakeFortranCompilerABI.F
Linking Fortran executable cmTC_bffa4
/tmp/CMake/bin/cmake -E cmake_link_script CMakeFiles/cmTC_bffa4.dir/link.txt --verbose=1
flang version 21.1.3 (Fedora 21.1.3-1.fc43)
Target: x86_64-redhat-linux-gnu
Thread model: posix
InstalledDir: /usr/bin
System configuration file directory: /etc/clang/
Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-redhat-linux/15
Selected GCC installation: /usr/bin/../lib/gcc/x86_64-redhat-linux/15
Candidate multilib: .@m64
Candidate multilib: 32@m32
Selected multilib: .@m64
"/usr/bin/ld" --hash-style=gnu --build-id --eh-frame-hdr -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -o cmTC_bffa4 /usr/bin/../lib/gcc/x86_64-redhat-linux/15/../../../../lib64/crt1.o /usr/bin/../lib/gcc/x86_64-redhat-linux/15/../../../../lib64/crti.o /usr/bin/../lib/gcc/x86_64-redhat-linux/15/crtbegin.o -L/usr/bin/../lib/clang/21/lib/x86_64-redhat-linux-gnu -L/usr/bin/../lib/gcc/x86_64-redhat-linux/15 -L/usr/bin/../lib/gcc/x86_64-redhat-linux/15/../../../../lib64 -L/lib/../lib64 -L/usr/lib64 -L/lib -L/usr/lib -v CMakeFiles/cmTC_bffa4.dir/CMakeFortranCompilerABI.F.o -L/usr/lib -lflang_rt.runtime -lm -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/bin/../lib/gcc/x86_64-redhat-linux/15/crtend.o /usr/bin/../lib/gcc/x86_64-redhat-linux/15/../../../../lib64/crtn.o
GNU ld version 2.45-1.fc43
/usr/bin/flang-21 -v -Wl,-v CMakeFiles/cmTC_bffa4.dir/CMakeFortranCompilerABI.F.o -o cmTC_bffa4
gmake[1]: Leaving directory '/tmp/ii/CMakeFiles/CMakeTmp'
@@ -45,6 +45,7 @@ set(targets
linux-CUDA-NVIDIA-10.1.168-CLANG linux-CUDA-NVIDIA-10.1.168-XLClang-v
linux-CUDA-NVIDIA-9.2.148-GCC
linux-Fortran-LLVMFlang-15.0.0
linux-Fortran-LLVMFlang-21.1.3
linux-Fortran-LFortran-0.35.0-clang
linux-Fortran-LFortran-0.35.0-gcc
linux-Fortran-LFortran-0.41.0-clang
@@ -0,0 +1,4 @@
libs=flang_rt.runtime;m;gcc;gcc_s;c;gcc;gcc_s
dirs=/usr/lib/clang/21/lib/x86_64-redhat-linux-gnu;/usr/lib/gcc/x86_64-redhat-linux/15;/usr/lib64;/lib64;/lib;/usr/lib
library_arch=x86_64-redhat-linux-gnu
linker_tool=/usr/bin/ld