1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-05-07 22:06:42 +08:00

ci: use Fedora 42 images and environments

This commit is contained in:
Brad King 2025-04-22 13:57:18 -04:00
parent efa818f661
commit 5b21de16a0
53 changed files with 124 additions and 123 deletions

View File

@ -61,7 +61,7 @@ p:source-package:
p:doc-package:
extends:
- .fedora41_sphinx_package
- .fedora42_sphinx_package
- .cmake_prep_doc_linux
- .linux_x86_64_tags
- .cmake_doc_artifacts
@ -111,18 +111,18 @@ l:iwyu-debian12:
- .cmake_cdash_artifacts
- .run_automatically
l:tidy-fedora41:
l:tidy-fedora42:
extends:
- .fedora41_tidy
- .fedora42_tidy
- .cmake_build_linux
- .cmake_tidy_artifacts
- .linux_x86_64_tags
- .cmake_cdash_artifacts
- .run_automatically
l:sphinx-fedora41:
l:sphinx-fedora42:
extends:
- .fedora41_sphinx
- .fedora42_sphinx
- .cmake_build_linux
- .cmake_sphinx_artifacts
- .linux_x86_64_tags
@ -131,9 +131,9 @@ l:sphinx-fedora41:
CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_HELP: "true"
l:clang-analyzer-fedora41:
l:clang-analyzer-fedora42:
extends:
- .fedora41_clang_analyzer
- .fedora42_clang_analyzer
- .cmake_build_linux
- .linux_x86_64_tags
- .run_automatically
@ -227,9 +227,9 @@ t:debian12-hip-radeon:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-hip-radeon:
t:fedora42-hip-radeon:
extends:
- .fedora41_hip_radeon
- .fedora42_hip_radeon
- .cmake_test_linux_release
- .linux_x86_64_tags_rocm6.2
- .run_dependent
@ -237,9 +237,9 @@ t:fedora41-hip-radeon:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-makefiles-lfortran:
t:fedora42-makefiles-lfortran:
extends:
- .fedora41_makefiles_lfortran
- .fedora42_makefiles_lfortran
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@ -247,9 +247,9 @@ t:fedora41-makefiles-lfortran:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-ninja-lfortran:
t:fedora42-ninja-lfortran:
extends:
- .fedora41_ninja_lfortran
- .fedora42_ninja_lfortran
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@ -257,9 +257,9 @@ t:fedora41-ninja-lfortran:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-ninja-clang:
t:fedora42-ninja-clang:
extends:
- .fedora41_ninja_clang
- .fedora42_ninja_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@ -267,9 +267,9 @@ t:fedora41-ninja-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-ninja-multi-clang:
t:fedora42-ninja-multi-clang:
extends:
- .fedora41_ninja_multi_clang
- .fedora42_ninja_multi_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@ -277,9 +277,9 @@ t:fedora41-ninja-multi-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-makefiles-clang:
t:fedora42-makefiles-clang:
extends:
- .fedora41_makefiles_clang
- .fedora42_makefiles_clang
- .cmake_test_linux_release
- .linux_x86_64_tags
- .run_dependent
@ -287,17 +287,17 @@ t:fedora41-makefiles-clang:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-makefiles:
t:fedora42-makefiles:
extends:
- .fedora41_makefiles
- .fedora42_makefiles
- .cmake_test_linux_release
- .linux_x86_64_v3_tags
- .run_dependent
- .needs_centos7_x86_64
t:fedora41-makefiles-nospace:
t:fedora42-makefiles-nospace:
extends:
- .fedora41_makefiles
- .fedora42_makefiles
- .cmake_test_linux_release
- .linux_x86_64_v3_tags
- .cmake_junit_artifacts
@ -305,7 +305,7 @@ t:fedora41-makefiles-nospace:
- .needs_centos7_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CI_BUILD_NAME: fedora41_makefiles_nospace
CMAKE_CI_BUILD_NAME: fedora42_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
t:nvhpc24.9-ninja:
@ -492,9 +492,9 @@ t:debian10-legacy:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora41-ninja:
b:fedora42-ninja:
extends:
- .fedora41_ninja
- .fedora42_ninja
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@ -502,9 +502,9 @@ b:fedora41-ninja:
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
b:fedora41-makefiles-symlinked:
b:fedora42-makefiles-symlinked:
extends:
- .fedora41_makefiles_symlinked
- .fedora42_makefiles_symlinked
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@ -539,48 +539,48 @@ b:debian12-aarch64-extdeps:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:fedora41-extdeps:
b:fedora42-extdeps:
extends:
- .fedora41_extdeps
- .fedora42_extdeps
- .cmake_build_linux_standalone
- .linux_x86_64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-ninja:
t:fedora42-ninja:
extends:
- .fedora41_ninja
- .fedora42_ninja
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
needs:
- b:fedora41-ninja
- b:fedora42-ninja
variables:
CMAKE_CI_JOB_CONTINUOUS: "true"
t:fedora41-makefiles-symlinked:
t:fedora42-makefiles-symlinked:
extends:
- .fedora41_makefiles_symlinked
- .fedora42_makefiles_symlinked
- .cmake_test_linux
- .linux_x86_64_tags_x11
- .cmake_test_artifacts
- .run_dependent
needs:
- b:fedora41-makefiles-symlinked
- b:fedora42-makefiles-symlinked
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-ninja-multi:
t:fedora42-ninja-multi:
extends:
- .fedora41_ninja_multi
- .fedora42_ninja_multi
- .cmake_test_linux_external
- .linux_x86_64_tags
- .cmake_junit_artifacts
- .run_dependent
needs:
- t:fedora41-ninja
- t:fedora42-ninja
t:intel2016u2-makefiles:
extends:
@ -874,9 +874,9 @@ u:sunos-sparc64-package:
## Sanitizer builds
b:fedora41-asan:
b:fedora42-asan:
extends:
- .fedora41_asan
- .fedora42_asan
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_x86_64_tags
@ -884,14 +884,14 @@ b:fedora41-asan:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
t:fedora41-asan:
t:fedora42-asan:
extends:
- .fedora41_asan
- .fedora42_asan
- .cmake_memcheck_linux
- .linux_x86_64_tags
- .run_dependent
needs:
- b:fedora41-asan
- b:fedora42-asan
variables:
CMAKE_CI_JOB_NIGHTLY: "true"

View File

@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake")

View File

@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common_lfortran.cmake")

View File

@ -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_fedora41_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")

View File

@ -1,4 +1,4 @@
set(configure_no_sccache 1)
set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")

View File

@ -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_fedora41_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake")

View File

@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_lfortran.cmake")

View File

@ -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_fedora41_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")

View File

@ -17,4 +17,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_fedora41_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")

View File

@ -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_fedora41_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake")

View File

@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_lfortran.cmake")

View File

@ -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_fedora41_common_clang.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common_clang.cmake")

View File

@ -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_fedora41_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora42_common.cmake")

View File

@ -1,3 +0,0 @@
export CC=/usr/bin/clang-19
export CXX=/usr/bin/clang++-19
export FC=/usr/bin/flang-new

View File

@ -1 +0,0 @@
export HIPCXX=/usr/bin/clang++-18

View File

@ -1 +0,0 @@
. .gitlab/ci/env_fedora41_common_clang.sh

View File

@ -1 +0,0 @@
. .gitlab/ci/env_fedora41_common_lfortran.sh

View File

@ -1 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/env_fedora41_makefiles.cmake")

View File

@ -1 +0,0 @@
. .gitlab/ci/env_fedora41_makefiles.sh

View File

@ -1 +0,0 @@
. .gitlab/ci/env_fedora41_common_clang.sh

View File

@ -1 +0,0 @@
. .gitlab/ci/env_fedora41_common_lfortran.sh

View File

@ -1 +0,0 @@
. .gitlab/ci/env_fedora41_common_clang.sh

View File

@ -0,0 +1,3 @@
export CC=/usr/bin/clang-20
export CXX=/usr/bin/clang++-20
export FC=/usr/bin/flang-20

View File

@ -0,0 +1,2 @@
export HIPCXX=/usr/bin/clang++-20
export HIPFLAGS='--rocm-path=/usr --rocm-device-lib-path=/usr/lib64/rocm/llvm/lib/clang/18/amdgcn/bitcode'

View File

@ -0,0 +1 @@
. .gitlab/ci/env_fedora42_common_clang.sh

View File

@ -0,0 +1 @@
. .gitlab/ci/env_fedora42_common_lfortran.sh

View File

@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/env_fedora42_makefiles.cmake")

View File

@ -0,0 +1 @@
. .gitlab/ci/env_fedora42_makefiles.sh

View File

@ -0,0 +1 @@
. .gitlab/ci/env_fedora42_common_clang.sh

View File

@ -0,0 +1 @@
. .gitlab/ci/env_fedora42_common_lfortran.sh

View File

@ -0,0 +1 @@
. .gitlab/ci/env_fedora42_common_clang.sh

View File

@ -5,7 +5,7 @@
### Release
.linux_prep_source:
image: "fedora:41"
image: "fedora:42"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@ -82,15 +82,15 @@
### Fedora
.fedora41:
image: "kitware/cmake:ci-fedora41-x86_64-2025-03-31"
.fedora42:
image: "kitware/cmake:ci-fedora42-x86_64-2025-04-22"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"
CMAKE_ARCH: x86_64
.fedora41_hip:
image: "kitware/cmake:ci-fedora41-hip-x86_64-2025-02-03"
.fedora42_hip:
image: "kitware/cmake:ci-fedora42-hip-x86_64-2025-04-22"
variables:
# FIXME(rocclr): device modules fail loading from binaries in paths with spaces
@ -99,36 +99,36 @@
#### Lint builds
.fedora41_tidy:
extends: .fedora41
.fedora42_tidy:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_tidy
CMAKE_CONFIGURATION: fedora42_tidy
CMAKE_CI_NO_INSTALL: 1
.fedora41_clang_analyzer:
extends: .fedora41
.fedora42_clang_analyzer:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_clang_analyzer
CMAKE_CONFIGURATION: fedora42_clang_analyzer
CMAKE_CI_BUILD_TYPE: Debug
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_CI_NO_INSTALL: 1
.fedora41_sphinx:
extends: .fedora41
.fedora42_sphinx:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_sphinx
CMAKE_CONFIGURATION: fedora42_sphinx
CTEST_NO_WARNINGS_ALLOWED: 1
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
CMAKE_CI_NO_INSTALL: 1
.fedora41_sphinx_package:
extends: .fedora41
.fedora42_sphinx_package:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_sphinx_package
CMAKE_CONFIGURATION: fedora42_sphinx_package
CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx"
#### Build and test
@ -184,43 +184,43 @@
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora41_extdeps:
extends: .fedora41
.fedora42_extdeps:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_extdeps
CMAKE_CONFIGURATION: fedora42_extdeps
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora41_ninja:
extends: .fedora41
.fedora42_ninja:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_ninja
CMAKE_CONFIGURATION: fedora42_ninja
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora41_ninja_multi:
extends: .fedora41
.fedora42_ninja_multi:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_ninja_multi
CMAKE_CONFIGURATION: fedora42_ninja_multi
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Ninja Multi-Config"
.fedora41_makefiles:
extends: .fedora41
.fedora42_makefiles:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_makefiles
CMAKE_CONFIGURATION: fedora42_makefiles
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
.fedora41_makefiles_symlinked:
extends: .fedora41
.fedora42_makefiles_symlinked:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_makefiles_symlinked
CMAKE_CONFIGURATION: fedora42_makefiles_symlinked
CTEST_NO_WARNINGS_ALLOWED: 1
CMAKE_GENERATOR: "Unix Makefiles"
CMAKE_CI_IN_SYMLINK_TREE: 1
@ -241,43 +241,43 @@
variables:
CMAKE_CONFIGURATION: debian12_ninja_clang
.fedora41_makefiles_clang:
extends: .fedora41
.fedora42_makefiles_clang:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_makefiles_clang
CMAKE_CONFIGURATION: fedora42_makefiles_clang
CMAKE_GENERATOR: "Unix Makefiles"
.fedora41_makefiles_lfortran:
extends: .fedora41
.fedora42_makefiles_lfortran:
extends: .fedora42
variables:
# FIXME(lfortran): -rpath flags with spaces not forwarded
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CONFIGURATION: fedora41_makefiles_lfortran
CMAKE_CONFIGURATION: fedora42_makefiles_lfortran
CMAKE_GENERATOR: "Unix Makefiles"
CTEST_LABELS: "Fortran"
.fedora41_ninja_lfortran:
extends: .fedora41
.fedora42_ninja_lfortran:
extends: .fedora42
variables:
# FIXME(lfortran): -rpath flags with spaces not forwarded
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CONFIGURATION: fedora41_ninja_lfortran
CMAKE_CONFIGURATION: fedora42_ninja_lfortran
CTEST_LABELS: "Fortran"
.fedora41_ninja_clang:
extends: .fedora41
.fedora42_ninja_clang:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_ninja_clang
CMAKE_CONFIGURATION: fedora42_ninja_clang
.fedora41_ninja_multi_clang:
extends: .fedora41
.fedora42_ninja_multi_clang:
extends: .fedora42
variables:
CMAKE_CONFIGURATION: fedora41_ninja_multi_clang
CMAKE_CONFIGURATION: fedora42_ninja_multi_clang
CMAKE_GENERATOR: "Ninja Multi-Config"
### Sanitizers
@ -293,13 +293,13 @@
CTEST_MEMORYCHECK_TYPE: AddressSanitizer
CTEST_MEMORYCHECK_SANITIZER_OPTIONS: ""
.fedora41_asan:
.fedora42_asan:
extends:
- .fedora41
- .fedora42
- .fedora_asan_addon
variables:
CMAKE_CONFIGURATION: fedora41_asan
CMAKE_CONFIGURATION: fedora42_asan
### Intel Compiler
@ -476,11 +476,11 @@
CMAKE_CONFIGURATION: debian12_hip_radeon
CTEST_LABELS: "HIP"
.fedora41_hip_radeon:
extends: .fedora41_hip
.fedora42_hip_radeon:
extends: .fedora42_hip
variables:
CMAKE_CONFIGURATION: fedora41_hip_radeon
CMAKE_CONFIGURATION: fedora42_hip_radeon
CTEST_LABELS: "HIP"
.hip6.3_nvidia:
@ -637,14 +637,14 @@
.cmake_version_update_linux:
stage: build
extends: .fedora41
extends: .fedora42
script:
- .gitlab/ci/cmake_version_update.sh
interruptible: false # The job internally fetches and retries.
.cmake_spellcheck_linux:
stage: build
extends: .fedora41
extends: .fedora42
script:
- .gitlab/ci/codespell.bash
- .gitlab/ci/typos.bash
@ -815,7 +815,7 @@
.cmake_org_help:
stage: build
extends:
- .fedora41
- .fedora42
- .linux_x86_64_tags
- .cmake_org_help_artifacts
script:

View File

@ -1,7 +1,7 @@
# Steps for uploading artifacts
.rsync_upload_package:
image: "fedora:41"
image: "fedora:42"
stage: upload
tags:
- cmake
@ -21,7 +21,7 @@
.rsync_upload_help:
stage: upload
image: "fedora:41"
image: "fedora:42"
tags:
- cmake
- docker