summaryrefslogtreecommitdiffstats
path: root/.gitlab/ci
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-07-27 17:16:27 (GMT)
committerBrad King <brad.king@kitware.com>2023-07-28 13:14:07 (GMT)
commit09db788636d3fccf23b6a670b4630b905eb24f2a (patch)
treeeb409cab85df344fab20800fc0ccf8258ba7f8f8 /.gitlab/ci
parent9526679bbc882f6eb904a401380cf3d6574ba91a (diff)
downloadCMake-09db788636d3fccf23b6a670b4630b905eb24f2a.zip
CMake-09db788636d3fccf23b6a670b4630b905eb24f2a.tar.gz
CMake-09db788636d3fccf23b6a670b4630b905eb24f2a.tar.bz2
ci: use Debian 12 images and environments
Diffstat (limited to '.gitlab/ci')
-rw-r--r--.gitlab/ci/configure_debian12_aarch64_extdeps.cmake (renamed from .gitlab/ci/configure_debian10_extdeps.cmake)0
-rw-r--r--.gitlab/ci/configure_debian12_aarch64_ninja.cmake (renamed from .gitlab/ci/configure_debian10_aarch64_ninja.cmake)11
-rw-r--r--.gitlab/ci/configure_debian12_extdeps.cmake (renamed from .gitlab/ci/configure_debian10_aarch64_extdeps.cmake)0
-rw-r--r--.gitlab/ci/configure_debian12_iwyu.cmake (renamed from .gitlab/ci/configure_debian10_iwyu.cmake)2
-rw-r--r--.gitlab/ci/configure_debian12_makefiles_clang.cmake (renamed from .gitlab/ci/configure_debian10_ninja_clang.cmake)0
-rw-r--r--.gitlab/ci/configure_debian12_makefiles_inplace.cmake (renamed from .gitlab/ci/configure_debian10_makefiles_inplace.cmake)0
-rw-r--r--.gitlab/ci/configure_debian12_ninja.cmake (renamed from .gitlab/ci/configure_debian10_ninja.cmake)14
-rw-r--r--.gitlab/ci/configure_debian12_ninja_clang.cmake (renamed from .gitlab/ci/configure_debian10_makefiles_clang.cmake)0
-rw-r--r--.gitlab/ci/env_debian10_makefiles_clang.sh2
-rw-r--r--.gitlab/ci/env_debian10_ninja_clang.sh2
-rw-r--r--.gitlab/ci/env_debian12_aarch64_extdeps.sh (renamed from .gitlab/ci/env_debian10_extdeps.sh)0
-rw-r--r--.gitlab/ci/env_debian12_extdeps.sh (renamed from .gitlab/ci/env_debian10_aarch64_extdeps.sh)0
-rw-r--r--.gitlab/ci/env_debian12_makefiles_clang.sh2
-rw-r--r--.gitlab/ci/env_debian12_ninja.sh (renamed from .gitlab/ci/env_debian10_ninja.sh)2
-rw-r--r--.gitlab/ci/env_debian12_ninja_clang.sh2
15 files changed, 15 insertions, 22 deletions
diff --git a/.gitlab/ci/configure_debian10_extdeps.cmake b/.gitlab/ci/configure_debian12_aarch64_extdeps.cmake
index 8e545f5..8e545f5 100644
--- a/.gitlab/ci/configure_debian10_extdeps.cmake
+++ b/.gitlab/ci/configure_debian12_aarch64_extdeps.cmake
diff --git a/.gitlab/ci/configure_debian10_aarch64_ninja.cmake b/.gitlab/ci/configure_debian12_aarch64_ninja.cmake
index 91d4632..5b97e4f 100644
--- a/.gitlab/ci/configure_debian10_aarch64_ninja.cmake
+++ b/.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 "")
diff --git a/.gitlab/ci/configure_debian10_aarch64_extdeps.cmake b/.gitlab/ci/configure_debian12_extdeps.cmake
index 8e545f5..8e545f5 100644
--- a/.gitlab/ci/configure_debian10_aarch64_extdeps.cmake
+++ b/.gitlab/ci/configure_debian12_extdeps.cmake
diff --git a/.gitlab/ci/configure_debian10_iwyu.cmake b/.gitlab/ci/configure_debian12_iwyu.cmake
index abe750d..ff6db60 100644
--- a/.gitlab/ci/configure_debian10_iwyu.cmake
+++ b/.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")
diff --git a/.gitlab/ci/configure_debian10_ninja_clang.cmake b/.gitlab/ci/configure_debian12_makefiles_clang.cmake
index 20863a2..20863a2 100644
--- a/.gitlab/ci/configure_debian10_ninja_clang.cmake
+++ b/.gitlab/ci/configure_debian12_makefiles_clang.cmake
diff --git a/.gitlab/ci/configure_debian10_makefiles_inplace.cmake b/.gitlab/ci/configure_debian12_makefiles_inplace.cmake
index 33f0db0..33f0db0 100644
--- a/.gitlab/ci/configure_debian10_makefiles_inplace.cmake
+++ b/.gitlab/ci/configure_debian12_makefiles_inplace.cmake
diff --git a/.gitlab/ci/configure_debian10_ninja.cmake b/.gitlab/ci/configure_debian12_ninja.cmake
index 0576d11..f70e3d5 100644
--- a/.gitlab/ci/configure_debian10_ninja.cmake
+++ b/.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 "")
diff --git a/.gitlab/ci/configure_debian10_makefiles_clang.cmake b/.gitlab/ci/configure_debian12_ninja_clang.cmake
index 20863a2..20863a2 100644
--- a/.gitlab/ci/configure_debian10_makefiles_clang.cmake
+++ b/.gitlab/ci/configure_debian12_ninja_clang.cmake
diff --git a/.gitlab/ci/env_debian10_makefiles_clang.sh b/.gitlab/ci/env_debian10_makefiles_clang.sh
deleted file mode 100644
index e0d5d61..0000000
--- a/.gitlab/ci/env_debian10_makefiles_clang.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export CC=/usr/bin/clang-7
-export CXX=/usr/bin/clang++-7
diff --git a/.gitlab/ci/env_debian10_ninja_clang.sh b/.gitlab/ci/env_debian10_ninja_clang.sh
deleted file mode 100644
index e0d5d61..0000000
--- a/.gitlab/ci/env_debian10_ninja_clang.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export CC=/usr/bin/clang-7
-export CXX=/usr/bin/clang++-7
diff --git a/.gitlab/ci/env_debian10_extdeps.sh b/.gitlab/ci/env_debian12_aarch64_extdeps.sh
index 7076e18..7076e18 100644
--- a/.gitlab/ci/env_debian10_extdeps.sh
+++ b/.gitlab/ci/env_debian12_aarch64_extdeps.sh
diff --git a/.gitlab/ci/env_debian10_aarch64_extdeps.sh b/.gitlab/ci/env_debian12_extdeps.sh
index 7076e18..7076e18 100644
--- a/.gitlab/ci/env_debian10_aarch64_extdeps.sh
+++ b/.gitlab/ci/env_debian12_extdeps.sh
diff --git a/.gitlab/ci/env_debian12_makefiles_clang.sh b/.gitlab/ci/env_debian12_makefiles_clang.sh
new file mode 100644
index 0000000..eda7c1f
--- /dev/null
+++ b/.gitlab/ci/env_debian12_makefiles_clang.sh
@@ -0,0 +1,2 @@
+export CC=/usr/bin/clang-15
+export CXX=/usr/bin/clang++-15
diff --git a/.gitlab/ci/env_debian10_ninja.sh b/.gitlab/ci/env_debian12_ninja.sh
index ba8ad47..b2b471d 100644
--- a/.gitlab/ci/env_debian10_ninja.sh
+++ b/.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"
diff --git a/.gitlab/ci/env_debian12_ninja_clang.sh b/.gitlab/ci/env_debian12_ninja_clang.sh
new file mode 100644
index 0000000..eda7c1f
--- /dev/null
+++ b/.gitlab/ci/env_debian12_ninja_clang.sh
@@ -0,0 +1,2 @@
+export CC=/usr/bin/clang-15
+export CXX=/usr/bin/clang++-15