Browse Source

ci: use Debian 13 images and environments

Brad King 3 weeks ago
parent
commit
1445a8e7db

+ 21 - 21
.gitlab-ci.yml

@@ -104,9 +104,9 @@ l:spellcheck:
         - .linux_x86_64_tags
         - .run_automatically
 
-l:iwyu-debian12:
+l:iwyu-debian13:
     extends:
-        - .debian12_iwyu
+        - .debian13_iwyu
         - .cmake_build_linux
         - .linux_x86_64_tags
         - .cmake_cdash_artifacts
@@ -245,9 +245,9 @@ b:centos7-aarch64:
         CMAKE_CI_ARTIFACTS_NAME: "artifacts-centos7-aarch64"
         CMAKE_CI_NO_MR: "true"
 
-t:debian12-ninja:
+t:debian13-ninja:
     extends:
-        - .debian12_ninja
+        - .debian13_ninja
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .cmake_junit_artifacts
@@ -256,9 +256,9 @@ t:debian12-ninja:
     variables:
         CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
 
-t:debian12-aarch64-ninja:
+t:debian13-aarch64-ninja:
     extends:
-        - .debian12_aarch64_ninja
+        - .debian13_aarch64_ninja
         - .cmake_test_linux_release
         - .linux_aarch64_tags
         - .cmake_junit_artifacts
@@ -267,9 +267,9 @@ t:debian12-aarch64-ninja:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-t:debian12-ninja-clang:
+t:debian13-ninja-clang:
     extends:
-        - .debian12_ninja_clang
+        - .debian13_ninja_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -277,9 +277,9 @@ t:debian12-ninja-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:debian12-makefiles-clang:
+t:debian13-makefiles-clang:
     extends:
-        - .debian12_makefiles_clang
+        - .debian13_makefiles_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -287,9 +287,9 @@ t:debian12-makefiles-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:debian12-ninja-multi-symlinked:
+t:debian13-ninja-multi-symlinked:
     extends:
-        - .debian12_ninja_multi_symlinked
+        - .debian13_ninja_multi_symlinked
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .cmake_junit_artifacts
@@ -299,11 +299,11 @@ t:debian12-ninja-multi-symlinked:
         CMAKE_CI_JOB_NIGHTLY: "true"
         CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
 
-t:debian12-hip-radeon:
+t:debian13-hip-radeon:
     extends:
-        - .debian12_hip_radeon
+        - .debian13_hip_radeon
         - .cmake_test_linux_release
-        - .linux_x86_64_tags_rocm5.2
+        - .linux_x86_64_tags_rocm5.7
         - .run_dependent
         - .needs_centos7_x86_64
     variables:
@@ -636,27 +636,27 @@ b:fedora43-makefiles-symlinked:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:debian12-makefiles-inplace:
+b:debian13-makefiles-inplace:
     extends:
-        - .debian12_makefiles_inplace
+        - .debian13_makefiles_inplace
         - .cmake_build_linux_standalone
         - .linux_x86_64_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:debian12-extdeps:
+b:debian13-extdeps:
     extends:
-        - .debian12_extdeps
+        - .debian13_extdeps
         - .cmake_build_linux_standalone
         - .linux_x86_64_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:debian12-aarch64-extdeps:
+b:debian13-aarch64-extdeps:
     extends:
-        - .debian12_aarch64_extdeps
+        - .debian13_aarch64_extdeps
         - .cmake_build_linux_standalone
         - .linux_aarch64_tags
         - .run_manually

+ 0 - 0
.gitlab/ci/configure_debian12_aarch64_extdeps.cmake → .gitlab/ci/configure_debian13_aarch64_extdeps.cmake


+ 0 - 0
.gitlab/ci/configure_debian12_aarch64_ninja.cmake → .gitlab/ci/configure_debian13_aarch64_ninja.cmake


+ 0 - 0
.gitlab/ci/configure_debian12_extdeps.cmake → .gitlab/ci/configure_debian13_extdeps.cmake


+ 0 - 0
.gitlab/ci/configure_debian12_hip_radeon.cmake → .gitlab/ci/configure_debian13_hip_radeon.cmake


+ 1 - 1
.gitlab/ci/configure_debian12_iwyu.cmake → .gitlab/ci/configure_debian13_iwyu.cmake

@@ -2,6 +2,6 @@ set(CMake_RUN_IWYU ON CACHE BOOL "")
 set(CMake_IWYU_OPTIONS "-DCMAKE_IWYU_FORWARD_STD_HASH" CACHE STRING "")
 # Uncomment to diagnose IWYU problems as needed.
 #set(CMake_IWYU_VERBOSE ON CACHE BOOL "")
-set(IWYU_COMMAND "/usr/bin/include-what-you-use-15" CACHE FILEPATH "")
+set(IWYU_COMMAND "/usr/bin/include-what-you-use-19" CACHE FILEPATH "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")

+ 0 - 0
.gitlab/ci/configure_debian12_makefiles_clang.cmake → .gitlab/ci/configure_debian13_makefiles_clang.cmake


+ 0 - 0
.gitlab/ci/configure_debian12_makefiles_inplace.cmake → .gitlab/ci/configure_debian13_makefiles_inplace.cmake


+ 1 - 1
.gitlab/ci/configure_debian12_ninja.cmake → .gitlab/ci/configure_debian13_ninja.cmake

@@ -1,4 +1,4 @@
 set(CMake_TEST_ASM_NASM "ON" CACHE BOOL "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_debian12_ninja_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_debian13_ninja_common.cmake")
 set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")

+ 0 - 0
.gitlab/ci/configure_debian12_ninja_clang.cmake → .gitlab/ci/configure_debian13_ninja_clang.cmake


+ 1 - 1
.gitlab/ci/configure_debian12_ninja_common.cmake → .gitlab/ci/configure_debian13_ninja_common.cmake

@@ -90,7 +90,7 @@ set(CMake_TEST_FindPython3 "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3_IronPython "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3_PyPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindRuby "ON" CACHE BOOL "")
-#set(CMake_TEST_FindRuby_RBENV "ON" CACHE BOOL "") # fails because system and rbenv versions are same
+set(CMake_TEST_FindRuby_RBENV "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 "")

+ 1 - 1
.gitlab/ci/configure_debian12_ninja_multi_symlinked.cmake → .gitlab/ci/configure_debian13_ninja_multi_symlinked.cmake

@@ -3,5 +3,5 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/configure_debian12_ninja_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_debian13_ninja_common.cmake")
 set(CMake_TEST_UseSWIG "OFF" CACHE BOOL "")

+ 0 - 9
.gitlab/ci/env_debian12_hip_radeon.sh

@@ -1,9 +0,0 @@
-export HIPCXX=/usr/bin/clang++-15
-export HIPFLAGS='--rocm-path=/usr --rocm-device-lib-path=/usr/lib/x86_64-linux-gnu/amdgcn/bitcode'
-
-# FIXME(debian): Clang is supposed to automatically parse a HIP version file.
-# The ROCm installer places it at '$prefix/bin/.hipVersion', but the package
-# on Debian moves it to '$prefix/share/hip/version'.  llvm-toolchain package
-# version 15.0.7-4 has 'debian/patches/amdgpu/usr-search-paths.patch' for this,
-# but Debian 12 currently provides version 15.0.6-4 without the patch.
-export HIPFLAGS="$HIPFLAGS --hip-version=5.2"

+ 0 - 0
.gitlab/ci/env_debian12_aarch64_extdeps.sh → .gitlab/ci/env_debian13_aarch64_extdeps.sh


+ 0 - 0
.gitlab/ci/env_debian12_extdeps.sh → .gitlab/ci/env_debian13_extdeps.sh


+ 1 - 0
.gitlab/ci/env_debian13_hip_radeon.sh

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

+ 2 - 2
.gitlab/ci/env_debian12_ninja_clang.sh → .gitlab/ci/env_debian13_makefiles_clang.sh

@@ -4,5 +4,5 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then
   source .gitlab/ci/emsdk-env.sh
 fi
 
-export CC=/usr/bin/clang-15
-export CXX=/usr/bin/clang++-15
+export CC=/usr/bin/clang-19
+export CXX=/usr/bin/clang++-19

+ 0 - 0
.gitlab/ci/env_debian12_ninja.sh → .gitlab/ci/env_debian13_ninja.sh


+ 2 - 2
.gitlab/ci/env_debian12_makefiles_clang.sh → .gitlab/ci/env_debian13_ninja_clang.sh

@@ -4,5 +4,5 @@ if test "$CMAKE_CI_NIGHTLY" = "true"; then
   source .gitlab/ci/emsdk-env.sh
 fi
 
-export CC=/usr/bin/clang-15
-export CXX=/usr/bin/clang++-15
+export CC=/usr/bin/clang-19
+export CXX=/usr/bin/clang++-19

+ 0 - 0
.gitlab/ci/env_debian12_ninja_multi_symlinked.sh → .gitlab/ci/env_debian13_ninja_multi_symlinked.sh


+ 36 - 36
.gitlab/os-linux.yml

@@ -58,23 +58,23 @@
 
 ### Debian
 
-.debian12:
-    image: "kitware/cmake:ci-debian12-x86_64-2025-03-31"
+.debian13:
+    image: "kitware/cmake:ci-debian13-x86_64-2025-11-11"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
         CMAKE_ARCH: x86_64
 
-.debian12_iwyu:
-    extends: .debian12
+.debian13_iwyu:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_iwyu
+        CMAKE_CONFIGURATION: debian13_iwyu
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_NO_INSTALL: 1
 
-.debian12_aarch64:
-    image: "kitware/cmake:ci-debian12-aarch64-2025-03-31"
+.debian13_aarch64:
+    image: "kitware/cmake:ci-debian13-aarch64-2025-11-11"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -169,54 +169,54 @@
 
 #### Build and test
 
-.debian12_ninja:
-    extends: .debian12
+.debian13_ninja:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_ninja
+        CMAKE_CONFIGURATION: debian13_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian12_aarch64_ninja:
-    extends: .debian12_aarch64
+.debian13_aarch64_ninja:
+    extends: .debian13_aarch64
 
     variables:
-        CMAKE_CONFIGURATION: debian12_aarch64_ninja
+        CMAKE_CONFIGURATION: debian13_aarch64_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian12_makefiles_inplace:
-    extends: .debian12
+.debian13_makefiles_inplace:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_makefiles_inplace
+        CMAKE_CONFIGURATION: debian13_makefiles_inplace
         CMAKE_GENERATOR: "Unix Makefiles"
         CMAKE_CI_BOOTSTRAP: 1
         CMAKE_CI_INPLACE: 1
         CMAKE_CI_NO_INSTALL: 1
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian12_ninja_multi_symlinked:
-    extends: .debian12
+.debian13_ninja_multi_symlinked:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_ninja_multi_symlinked
+        CMAKE_CONFIGURATION: debian13_ninja_multi_symlinked
         CMAKE_GENERATOR: "Ninja Multi-Config"
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_IN_SYMLINK_TREE: 1
         CMAKE_CI_BUILD_DIR: "real_work/work/build"
 
-.debian12_extdeps:
-    extends: .debian12
+.debian13_extdeps:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_extdeps
+        CMAKE_CONFIGURATION: debian13_extdeps
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian12_aarch64_extdeps:
-    extends: .debian12_aarch64
+.debian13_aarch64_extdeps:
+    extends: .debian13_aarch64
 
     variables:
-        CMAKE_CONFIGURATION: debian12_aarch64_extdeps
+        CMAKE_CONFIGURATION: debian13_aarch64_extdeps
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
@@ -272,18 +272,18 @@
 
 ### Clang Compiler
 
-.debian12_makefiles_clang:
-    extends: .debian12
+.debian13_makefiles_clang:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_makefiles_clang
+        CMAKE_CONFIGURATION: debian13_makefiles_clang
         CMAKE_GENERATOR: "Unix Makefiles"
 
-.debian12_ninja_clang:
-    extends: .debian12
+.debian13_ninja_clang:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_ninja_clang
+        CMAKE_CONFIGURATION: debian13_ninja_clang
 
 .fedora43_makefiles_clang:
     extends: .fedora43
@@ -551,11 +551,11 @@
         CMAKE_CONFIGURATION: hip6.3_radeon
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
-.debian12_hip_radeon:
-    extends: .debian12
+.debian13_hip_radeon:
+    extends: .debian13
 
     variables:
-        CMAKE_CONFIGURATION: debian12_hip_radeon
+        CMAKE_CONFIGURATION: debian13_hip_radeon
         CTEST_LABELS: "HIP"
 
 .fedora43_hip_radeon:
@@ -677,11 +677,11 @@
         - docker
         - linux-x86_64
 
-.linux_x86_64_tags_rocm5.2:
+.linux_x86_64_tags_rocm5.7:
     tags:
         - cmake
         - radeon
-        - rocm-5.2
+        - rocm-5.7
         - docker
         - linux-x86_64