소스 검색

ci: use Debian 12 images and environments

Brad King 2 년 전
부모
커밋
09db788636

+ 16 - 16
.gitlab-ci.yml

@@ -96,9 +96,9 @@ l:codespell:
         - .linux_x86_64_tags
         - .run_automatically
 
-l:iwyu-debian10:
+l:iwyu-debian12:
     extends:
-        - .debian10_iwyu
+        - .debian12_iwyu
         - .cmake_build_linux
         - .linux_x86_64_tags
         - .run_automatically
@@ -153,9 +153,9 @@ b:centos7-aarch64:
         CMAKE_CI_ARTIFACTS_NAME: "artifacts-centos7-aarch64"
         CMAKE_CI_NO_MR: "true"
 
-t:debian10-ninja:
+t:debian12-ninja:
     extends:
-        - .debian10_ninja
+        - .debian12_ninja
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .cmake_junit_artifacts
@@ -164,9 +164,9 @@ t:debian10-ninja:
     variables:
         CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
 
-t:debian10-aarch64-ninja:
+t:debian12-aarch64-ninja:
     extends:
-        - .debian10_aarch64_ninja
+        - .debian12_aarch64_ninja
         - .cmake_test_linux_release
         - .linux_aarch64_tags
         - .cmake_junit_artifacts
@@ -175,9 +175,9 @@ t:debian10-aarch64-ninja:
     variables:
         CMAKE_CI_NO_MR: "true"
 
-t:debian10-ninja-clang:
+t:debian12-ninja-clang:
     extends:
-        - .debian10_ninja_clang
+        - .debian12_ninja_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -185,9 +185,9 @@ t:debian10-ninja-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:debian10-makefiles-clang:
+t:debian12-makefiles-clang:
     extends:
-        - .debian10_makefiles_clang
+        - .debian12_makefiles_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags
         - .run_dependent
@@ -354,27 +354,27 @@ b:fedora38-ninja:
     variables:
         CMAKE_CI_JOB_CONTINUOUS: "true"
 
-b:debian10-makefiles-inplace:
+b:debian12-makefiles-inplace:
     extends:
-        - .debian10_makefiles_inplace
+        - .debian12_makefiles_inplace
         - .cmake_build_linux_standalone
         - .linux_x86_64_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:debian10-extdeps:
+b:debian12-extdeps:
     extends:
-        - .debian10_extdeps
+        - .debian12_extdeps
         - .cmake_build_linux_standalone
         - .linux_x86_64_tags
         - .run_manually
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-b:debian10-aarch64-extdeps:
+b:debian12-aarch64-extdeps:
     extends:
-        - .debian10_aarch64_extdeps
+        - .debian12_aarch64_extdeps
         - .cmake_build_linux_standalone
         - .linux_aarch64_tags
         - .run_manually

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


+ 4 - 7
.gitlab/ci/configure_debian10_aarch64_ninja.cmake → .gitlab/ci/configure_debian12_aarch64_ninja.cmake

@@ -28,14 +28,14 @@ set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5 "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_MPICH_C_COMPILER "/usr/bin/h5pcc.mpich" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_MPICH_C_COMPILER_EXPLICIT "ON" CACHE BOOL "")
-# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/bin/h5c++.mpich" CACHE FILEPATH "") # h5c++.mpich does not exist
-# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
+set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/bin/h5c++.mpich" CACHE FILEPATH "")
+set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/bin/h5pfc.mpich" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/bin/h5pcc.openmpi" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER_EXPLICIT "ON" CACHE BOOL "")
-# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/bin/h5c++.openmpi" CACHE FILEPATH "") # h5c++.openmpi does not exist
-# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
+set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/bin/h5c++.openmpi" CACHE FILEPATH "")
+set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/bin/h5pfc.openmpi" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "")
@@ -74,11 +74,8 @@ set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
 set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
 set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
 set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2 "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3 "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_NumPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3_NumPy "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_PyPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3_PyPy "ON" CACHE BOOL "")
 set(CMake_TEST_FindRuby "ON" CACHE BOOL "")
 set(CMake_TEST_FindSDL "ON" CACHE BOOL "")

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


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

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

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


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


+ 5 - 9
.gitlab/ci/configure_debian10_ninja.cmake → .gitlab/ci/configure_debian12_ninja.cmake

@@ -32,14 +32,14 @@ set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5 "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_MPICH_C_COMPILER "/usr/bin/h5pcc.mpich" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_MPICH_C_COMPILER_EXPLICIT "ON" CACHE BOOL "")
-# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/bin/h5c++.mpich" CACHE FILEPATH "") # h5c++.mpich does not exist
-# set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
+set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER "/usr/bin/h5c++.mpich" CACHE FILEPATH "")
+set(CMake_TEST_FindHDF5_MPICH_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER "/usr/bin/h5pfc.mpich" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_MPICH_Fortran_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER "/usr/bin/h5pcc.openmpi" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_OpenMPI_C_COMPILER_EXPLICIT "ON" CACHE BOOL "")
-# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/bin/h5c++.openmpi" CACHE FILEPATH "") # h5c++.openmpi does not exist
-# set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
+set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER "/usr/bin/h5c++.openmpi" CACHE FILEPATH "")
+set(CMake_TEST_FindHDF5_OpenMPI_CXX_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER "/usr/bin/h5pfc.openmpi" CACHE FILEPATH "")
 set(CMake_TEST_FindHDF5_OpenMPI_Fortran_COMPILER_EXPLICIT "ON" CACHE BOOL "")
 set(CMake_TEST_FindHDF5_Serial_C_COMPILER "/usr/bin/h5cc" CACHE FILEPATH "")
@@ -78,12 +78,8 @@ set(CMake_TEST_FindPNG "ON" CACHE BOOL "")
 set(CMake_TEST_FindPostgreSQL "ON" CACHE BOOL "")
 set(CMake_TEST_FindProtobuf "ON" CACHE BOOL "")
 set(CMake_TEST_FindProtobuf_gRPC "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2 "ON" CACHE BOOL "")
 set(CMake_TEST_FindPython3 "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_IronPython "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_NumPy "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_NumPy "ON" CACHE BOOL "")
-set(CMake_TEST_FindPython2_PyPy "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_RVM "ON" CACHE BOOL "")

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


+ 0 - 2
.gitlab/ci/env_debian10_makefiles_clang.sh

@@ -1,2 +0,0 @@
-export CC=/usr/bin/clang-7
-export CXX=/usr/bin/clang++-7

+ 0 - 2
.gitlab/ci/env_debian10_ninja_clang.sh

@@ -1,2 +0,0 @@
-export CC=/usr/bin/clang-7
-export CXX=/usr/bin/clang++-7

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


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


+ 2 - 0
.gitlab/ci/env_debian12_makefiles_clang.sh

@@ -0,0 +1,2 @@
+export CC=/usr/bin/clang-15
+export CXX=/usr/bin/clang++-15

+ 1 - 1
.gitlab/ci/env_debian10_ninja.sh → .gitlab/ci/env_debian12_ninja.sh

@@ -1,4 +1,4 @@
-export MY_RUBY_HOME="/usr/local/rvm/rubies/ruby-2.7.0"
+export MY_RUBY_HOME="/usr/local/rvm/rubies/ruby-3.2.2"
 
 if test -z "$CI_MERGE_REQUEST_ID"; then
   curl -L -O "https://download.swift.org/swift-5.7.1-release/ubuntu1804/swift-5.7.1-RELEASE/swift-5.7.1-RELEASE-ubuntu18.04.tar.gz"

+ 2 - 0
.gitlab/ci/env_debian12_ninja_clang.sh

@@ -0,0 +1,2 @@
+export CC=/usr/bin/clang-15
+export CXX=/usr/bin/clang++-15

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

@@ -44,23 +44,23 @@
 
 ### Debian
 
-.debian10:
-    image: "kitware/cmake:ci-debian10-x86_64-2023-03-29"
+.debian12:
+    image: "kitware/cmake:ci-debian12-x86_64-2023-07-27"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
         CMAKE_ARCH: x86_64
 
-.debian10_iwyu:
-    extends: .debian10
+.debian12_iwyu:
+    extends: .debian12
 
     variables:
-        CMAKE_CONFIGURATION: debian10_iwyu
+        CMAKE_CONFIGURATION: debian12_iwyu
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMAKE_CI_NO_INSTALL: 1
 
-.debian10_aarch64:
-    image: "kitware/cmake:ci-debian10-aarch64-2023-03-29"
+.debian12_aarch64:
+    image: "kitware/cmake:ci-debian12-aarch64-2023-07-27"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -112,44 +112,44 @@
 
 #### Build and test
 
-.debian10_ninja:
-    extends: .debian10
+.debian12_ninja:
+    extends: .debian12
 
     variables:
-        CMAKE_CONFIGURATION: debian10_ninja
+        CMAKE_CONFIGURATION: debian12_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian10_aarch64_ninja:
-    extends: .debian10_aarch64
+.debian12_aarch64_ninja:
+    extends: .debian12_aarch64
 
     variables:
-        CMAKE_CONFIGURATION: debian10_aarch64_ninja
+        CMAKE_CONFIGURATION: debian12_aarch64_ninja
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian10_makefiles_inplace:
-    extends: .debian10
+.debian12_makefiles_inplace:
+    extends: .debian12
 
     variables:
-        CMAKE_CONFIGURATION: debian10_makefiles_inplace
+        CMAKE_CONFIGURATION: debian12_makefiles_inplace
         CMAKE_GENERATOR: "Unix Makefiles"
         CMAKE_CI_BOOTSTRAP: 1
         CMAKE_CI_INPLACE: 1
         CMAKE_CI_NO_INSTALL: 1
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian10_extdeps:
-    extends: .debian10
+.debian12_extdeps:
+    extends: .debian12
 
     variables:
-        CMAKE_CONFIGURATION: debian10_extdeps
+        CMAKE_CONFIGURATION: debian12_extdeps
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.debian10_aarch64_extdeps:
-    extends: .debian10_aarch64
+.debian12_aarch64_extdeps:
+    extends: .debian12_aarch64
 
     variables:
-        CMAKE_CONFIGURATION: debian10_aarch64_extdeps
+        CMAKE_CONFIGURATION: debian12_aarch64_extdeps
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
@@ -187,18 +187,18 @@
 
 ### Clang Compiler
 
-.debian10_makefiles_clang:
-    extends: .debian10
+.debian12_makefiles_clang:
+    extends: .debian12
 
     variables:
-        CMAKE_CONFIGURATION: debian10_makefiles_clang
+        CMAKE_CONFIGURATION: debian12_makefiles_clang
         CMAKE_GENERATOR: "Unix Makefiles"
 
-.debian10_ninja_clang:
-    extends: .debian10
+.debian12_ninja_clang:
+    extends: .debian12
 
     variables:
-        CMAKE_CONFIGURATION: debian10_ninja_clang
+        CMAKE_CONFIGURATION: debian12_ninja_clang
 
 .fedora38_makefiles_clang:
     extends: .fedora38