From a61ef50ea6f3e0f85c6ccd1dd6c181096e1cd208 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 6 Nov 2025 14:09:20 -0500 Subject: [PATCH] ci: Update Fedora 43 base image to get bzr and flang fixes * breezy: https://bugzilla.redhat.com/show_bug.cgi?id=2366194 * flang: https://bugzilla.redhat.com/show_bug.cgi?id=2401176 --- .gitlab/ci/configure_fedora43_makefiles.cmake | 6 +----- .gitlab/ci/env_fedora43_clazy.sh | 2 +- .gitlab/ci/env_fedora43_common_clang.sh | 6 ------ .gitlab/os-linux.yml | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitlab/ci/configure_fedora43_makefiles.cmake b/.gitlab/ci/configure_fedora43_makefiles.cmake index 2e9860d983..e84dcbd646 100644 --- a/.gitlab/ci/configure_fedora43_makefiles.cmake +++ b/.gitlab/ci/configure_fedora43_makefiles.cmake @@ -1,11 +1,7 @@ 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 "") -# 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_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 "") diff --git a/.gitlab/ci/env_fedora43_clazy.sh b/.gitlab/ci/env_fedora43_clazy.sh index dbf99d8ac9..007c52d47c 100644 --- a/.gitlab/ci/env_fedora43_clazy.sh +++ b/.gitlab/ci/env_fedora43_clazy.sh @@ -1,6 +1,6 @@ export CC=/usr/bin/clang export CXX=/usr/bin/clazy -export CLANGXX=/usr/bin/clang++-20 +export CLANGXX=/usr/bin/clang++ export CLAZY_CHECKS="level2\ ,no-base-class-event\ diff --git a/.gitlab/ci/env_fedora43_common_clang.sh b/.gitlab/ci/env_fedora43_common_clang.sh index c4fcd47d69..55533e7a42 100644 --- a/.gitlab/ci/env_fedora43_common_clang.sh +++ b/.gitlab/ci/env_fedora43_common_clang.sh @@ -1,9 +1,3 @@ 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 diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 08c6286780..557694440a 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -83,7 +83,7 @@ ### Fedora .fedora43: - image: "kitware/cmake:ci-fedora43-x86_64-2025-10-29" + image: "kitware/cmake:ci-fedora43-x86_64-2025-11-06" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"