Skip to content

Update OS used by the CI #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JAuriac wants to merge 1 commit into from
Closed

Update OS used by the CI #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13, macos-14, macos-15]
os: [macos-14, macos-15, macos-26]
cxx_std: ['17']
build_type: ['Debug']
runs-on: ${{matrix.os}}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (C) 2024 Commissariat a l'energie atomique et aux energies alternatives (CEA)
# Copyright (C) 2024-2025 Commissariat a l'energie atomique et aux energies alternatives (CEA)
#
# All rights reserved.
#
Expand Down Expand Up @@ -48,12 +48,12 @@ jobs:
- name: Test
uses: ./.github/actions/test/
with:
image: 'ghcr.io/pdidev/spack/${{matrix.version}}/${{matrix.compiler}}/${{matrix.mpi}}/${{matrix.variant}}:v3'
image: 'ghcr.io/pdidev/spack/${{matrix.version}}/${{matrix.compiler}}/${{matrix.mpi}}/${{matrix.variant}}:v4'
debuntu:
strategy:
fail-fast: false
matrix:
base: ['ubuntu/focal', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable']
base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable']
mpi: ['openmpi', 'mpich']
variant: ['mini', 'all']
runs-on: ubuntu-24.04
Expand All @@ -64,4 +64,4 @@ jobs:
- name: Test
uses: ./.github/actions/test/
with:
image: 'ghcr.io/pdidev/${{matrix.base}}/${{matrix.mpi}}/${{matrix.variant}}:v3'
image: 'ghcr.io/pdidev/${{matrix.base}}/${{matrix.mpi}}/${{matrix.variant}}:v4'
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
trace plugins [#556](https://github.com/pdidev/pdi/issues/556)

### Changed
* Update the version of dependencies according to our policy: oldest supported non-EOL
Ubuntu (22.04 Jammy Jellyfish), oldstable Debian & Spack 0.19. The new requirements are:
CMake 3.22...3.28, NetCDF 4.9.2 (from 4.7.3), Python 3.10, mpi4py 3.1, numpy 1.21, pybind11 2.10,
HDF5 1.14.3
For reference, the others requirements are kept :
JSON 3.11.4, libyaml 0.2.5, spdlog 1.14.1, ZPP 1.0.16
[#613](https://github.com/pdidev/pdi/issues/613)

### Deprecated

Expand Down
16 changes: 8 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

### Project header

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)
project(PDI_DIST LANGUAGES C CXX)


Expand Down Expand Up @@ -214,9 +214,9 @@ endif()
## Python3

if("${BUILD_PYTHON}")
find_package(Python3Path 3.8.2 REQUIRED COMPONENTS Interpreter Development)
find_package(Python3Path 3.10 REQUIRED COMPONENTS Interpreter Development)
elseif("${BUILD_FORTRAN}")
find_package(Python3Path 3.8.2 REQUIRED COMPONENTS Interpreter)
find_package(Python3Path 3.10 REQUIRED COMPONENTS Interpreter)
endif()


Expand Down Expand Up @@ -266,7 +266,7 @@ sbuild_add_dependency(yaml "${USE_DEFAULT}"
"-DINSTALL_INCLUDE_DIR:STRING=${CMAKE_INSTALL_INCLUDEDIR}"
"-DINSTALL_CMAKE_DIR:STRING=share/yaml/cmake"
"-DCMAKE_POLICY_VERSION_MINIMUM:STRING=3.5" # needed until upstream libyaml is updated (https://github.com/yaml/libyaml/pull/314)
VERSION 0.2.2
VERSION 0.2.5
)


Expand Down Expand Up @@ -301,14 +301,14 @@ sbuild_add_dependency(spdlog "${USE_DEFAULT}"
"-DSPDLOG_BUILD_EXAMPLES:BOOL=OFF"
"-DSPDLOG_BUILD_TESTS:BOOL=OFF"
"-DSPDLOG_FMT_EXTERNAL:BOOL=OFF"
VERSION 1.5.0
VERSION 1.14.1
)


## Doxygen

if("${BUILD_DOCUMENTATION}")
find_package(Doxygen 1.8.17 REQUIRED OPTIONAL_COMPONENTS dot)
find_package(Doxygen 1.15 REQUIRED OPTIONAL_COMPONENTS dot)
endif()


Expand Down Expand Up @@ -416,7 +416,7 @@ if("${BUILD_DECL_NETCDF_PLUGIN}")
-DENABLE_EXAMPLES:BOOL=OFF
-DENABLE_FILTER_TESTING:BOOL=OFF
-DENABLE_TESTS:BOOL=OFF
VERSION 4.7.3
VERSION 4.9.2
)
if("${NETCDF_FOUND}")
if("${BUILD_NETCDF_PARALLEL}" AND NOT "PARALLEL4" IN_LIST NetCDF_FEATURES)
Expand All @@ -443,7 +443,7 @@ if("${BUILD_PYTHON}")
"-DBUILD_TESTING:BOOL=OFF"
"-DPYBIND11_TEST:BOOL=OFF"
"-DPYBIND11_PYTHON_VERSION:STRING=${Python3_VERSION}"
VERSION 2.4.3
VERSION 2.10
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/Findyaml.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#--------------------------------------------------------------------------------

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

# - Check for the presence of libyaml
#
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# THE SOFTWARE.
################################################################################

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

include(GNUInstallDirs)
include(ExternalProject)
Expand Down
4 changes: 2 additions & 2 deletions example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)
project(pdi_examples LANGUAGES C)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

Expand All @@ -41,7 +41,7 @@ if("${BUILD_FORTRAN}")
endif()

if("${BUILD_PYTHON}")
find_package(Python3 3.8.2 REQUIRED COMPONENTS Interpreter)
find_package(Python3 3.10 REQUIRED COMPONENTS Interpreter)
list(APPEND PDI_COMPONENTS python)
endif()

Expand Down
2 changes: 1 addition & 1 deletion example/cmake/DefaultKind.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# THE SOFTWARE.
################################################################################

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

function(get_default_kind TYPE DEFAULT_KIND_VAR)
if(DEFINED "${DEFAULT_KIND_VAR}")
Expand Down
6 changes: 3 additions & 3 deletions pdi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)
project(PDI LANGUAGES CXX C)
list(APPEND CMAKE_MODULE_PATH "${PDI_SOURCE_DIR}/cmake")

Expand Down Expand Up @@ -110,10 +110,10 @@ endif()
find_package(paraconf 1.0.0 REQUIRED COMPONENTS ${PARACONF_COMPONENTS}) # must match PDIConfig.cmake.in
find_package(spdlog 1.5.0 REQUIRED) # must match PDIConfig.cmake.in
if("${BUILD_PYTHON}")
find_package(Python3Path 3.8.2 REQUIRED COMPONENTS Interpreter Development)
find_package(Python3Path 3.10 REQUIRED COMPONENTS Interpreter Development)
set(Python_ADDITIONAL_VERSIONS "${Python3_VERSION}" CACHE STRING "Python version found by FindPython3 for coherency" FORCE)
set(PYBIND11_PYTHON_VERSION "${Python3_VERSION}" CACHE STRING "Python version to use for compiling modules" FORCE)
find_package(pybind11 2.4.3 REQUIRED) # must match PDIConfig.cmake.in
find_package(pybind11 2.10 REQUIRED) # must match PDIConfig.cmake.in
endif()
if("${BUILD_FORTRAN}" OR "${BUILD_DOCUMENTATION}")
add_subdirectory("../vendor/zpp-1.1.0/" "zpp")
Expand Down
2 changes: 1 addition & 1 deletion pdi/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

project(PDI_benchmarks)

Expand Down
2 changes: 1 addition & 1 deletion pdi/cmake/DefaultKind.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# THE SOFTWARE.
################################################################################

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")

Expand Down
2 changes: 1 addition & 1 deletion pdi/cmake/FindGMock.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
#
# add_test(AllTestsInFoo foo)

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")

Expand Down
2 changes: 1 addition & 1 deletion pdi/cmake/FindPython3Path.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# THE SOFTWARE.
################################################################################

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

include(FindPackageHandleStandardArgs)

Expand Down
4 changes: 2 additions & 2 deletions pdi/cmake/PDIConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# THE SOFTWARE.
################################################################################

cmake_minimum_required(VERSION 3.16...3.25)
cmake_minimum_required(VERSION 3.22...3.28)

list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")

Expand Down Expand Up @@ -125,7 +125,7 @@ if(TARGET PDI::PDI_plugins)
find_dependency(spdlog 1.5.0)
endif()
if(TARGET PDI::PDI_pysupport)
find_dependency(pybind11 2.3.0)
find_dependency(pybind11 2.10)
endif()
if(TARGET PDI::PDI_f90)
find_dependency(paraconf 1.0.0 COMPONENTS C f90)
Expand Down
4 changes: 2 additions & 2 deletions pdi/docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

find_package(Doxygen 1.8.17 REQUIRED)
find_package(Doxygen 1.15 REQUIRED)

set(DOXYGEN_INPUT
"${CMAKE_CURRENT_SOURCE_DIR}/About.md"
Expand Down
2 changes: 1 addition & 1 deletion pdi/docs/First_steps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

if("${BUILD_FORTRAN}")
add_executable(hello_access.f90 hello_access.f90)
Expand Down
2 changes: 1 addition & 1 deletion pdi/docs/Source_installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Dependencies of **the Decl'HDF5 plugin**:
Dependencies of **the Decl'NetCDF plugin**:

* the PDI library,
* the [NetCDF](https://www.unidata.ucar.edu/software/netcdf/) library version 4.7.3 or above (provided),
* the [NetCDF](https://www.unidata.ucar.edu/software/netcdf/) library version 4.9.2 or above (provided),
* the [HDF5](https://www.hdfgroup.org/solutions/hdf5/) library version 1.10.4 or above (provided),
* **a MPI implementation for the parallel version of the plugin (not provided)**, such as
- [openmpi](https://www.open-mpi.org/) 4.0 or above,
Expand Down
2 changes: 1 addition & 1 deletion pdi/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

find_package(Threads REQUIRED)
if(NOT TARGET GTest::gtest)
Expand Down
2 changes: 1 addition & 1 deletion pdi/tests/fortran/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)
enable_language(Fortran)

# Includes
Expand Down
2 changes: 2 additions & 0 deletions plugins/decl_hdf5/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
* Possibility to add a regex for dataset name in datasets section
[#582](https://github.com/pdidev/pkgs/issues/582)
* Fix HDF5 compression test for MacOS 26
[#627](https://github.com/pdidev/pdi/issues/627)

### Changed

Expand Down
2 changes: 1 addition & 1 deletion plugins/decl_hdf5/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)
project(pdi_decl_hdf5_plugin LANGUAGES C CXX)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

Expand Down
2 changes: 1 addition & 1 deletion plugins/decl_hdf5/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

project(decl_hdf5_benchmarks)

Expand Down
2 changes: 1 addition & 1 deletion plugins/decl_hdf5/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

if(NOT TARGET GTest::gtest)
option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF)
Expand Down
2 changes: 1 addition & 1 deletion plugins/decl_hdf5/tests/compatibility_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# THE SOFTWARE.
#=============================================================================

cmake_minimum_required(VERSION 3.16...3.29)
cmake_minimum_required(VERSION 3.22...3.28)

set(RUNTEST_DIR "${CMAKE_CURRENT_LIST_DIR}/../../cmake/runtest-dir")

Expand Down
Loading
Loading