Skip to content

Commit

Permalink
Fixing github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidAce committed Jan 21, 2025
1 parent c87e04c commit 9fa74e7
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ graph.html
doxygen_log.txt
*__pycache__/
package*
CMakeUserPresets.json
conan_package.sh
docs/doc_build/doctrees
docs/doc_source/doxyoutput
docs/doc_source/api
docs/doc_source/_static
docs/doc_source/_templates
CMakeUserPresets.json
32 changes: 30 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@
"CMAKE_CXX_COMPILER": "clang++-17"
}
},
{
"name": "clang-18",
"hidden": true,
"cacheVariables": {
"CMAKE_C_COMPILER": "clang-18",
"CMAKE_CXX_COMPILER": "clang++-18"
}
},
{
"name": "pkg-cmake",
"hidden": true,
Expand Down Expand Up @@ -241,6 +249,14 @@
"release-cmake"
]
},
{
"name": "release-clang-18-cmake",
"displayName": "Release|clang-18|cmake package manager",
"inherits": [
"clang-18",
"release-cmake"
]
},
{
"name": "debug-conan",
"displayName": "Debug|conan package manager",
Expand Down Expand Up @@ -315,6 +331,14 @@
"debug-cmake"
]
},
{
"name": "debug-clang-18-conan",
"displayName": "Debug|clang-18|conan package manager",
"inherits": [
"clang-18",
"debug-conan"
]
},
{
"name": "github-actions",
"hidden": true,
Expand Down Expand Up @@ -457,11 +481,11 @@
},
{
"name": "release-clang-17-conan",
"configurePreset": "release-gcc-12-conan"
"configurePreset": "release-clang-17-conan"
},
{
"name": "release-clang-17-cmake",
"configurePreset": "release-gcc-12-cmake"
"configurePreset": "release-clang-17-cmake"
},
{
"name": "debug-conan",
Expand Down Expand Up @@ -499,6 +523,10 @@
"name": "debug-clang-17-cmake",
"configurePreset": "debug-clang-17-cmake"
},
{
"name": "debug-clang-18-conan",
"configurePreset": "debug-clang-18-conan"
},
{
"name": "github-actions-find",
"displayName": "github-actions using plain find_package",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![Ubuntu 20.04](https://github.com/DavidAce/h5pp/workflows/Ubuntu%2020.04/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![Ubuntu 22.04](https://github.com/DavidAce/h5pp/workflows/Ubuntu%2022.04/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![Windows 2019](https://github.com/DavidAce/h5pp/workflows/Windows%202019/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![Windows 2022](https://github.com/DavidAce/h5pp/workflows/Windows%202022/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![MacOS 11](https://github.com/DavidAce/h5pp/workflows/macOS%2011/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![MacOS 14](https://github.com/DavidAce/h5pp/workflows/macOS%2014/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![MacOS 15](https://github.com/DavidAce/h5pp/workflows/macOS%2015/badge.svg?branch=master)](https://github.com/DavidAce/h5pp/actions)
[![Documentation Status](https://readthedocs.org/projects/h5pp/badge/?version=latest)](https://h5pp.readthedocs.io/en/latest/?badge=latest)
[![Conan](https://img.shields.io/badge/Install%20with-conan-green)](https://conan.io/center/h5pp)
[![codecov](https://codecov.io/gh/davidace/h5pp/branch/dev/graph/badge.svg)](https://codecov.io/gh/davidace/h5pp)
Expand Down
4 changes: 2 additions & 2 deletions include/h5pp/details/h5ppDimensionType.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace h5pp {
DimsType(std::initializer_list<T> &&list) : std::vector<hsize_t>(std::begin(list), std::end(list)) {}

template<typename T, typename = std::enable_if_t<std::is_integral_v<T>>>
DimsType(T v) : std::vector<hsize_t>(1ul, static_cast<hsize_t>(v)) {}
DimsType(T v) : std::vector<hsize_t>(1ul, type::safe_cast<hsize_t>(v)) {}

template<typename T, typename = std::enable_if_t<h5pp::type::sfinae::is_iterable_v<T>>>
DimsType(const T &dims_) : std::vector<hsize_t>(std::begin(dims_), std::end(dims_)) {}
Expand All @@ -42,7 +42,7 @@ namespace h5pp {
: std::optional<std::vector<hsize_t>>(std::vector<hsize_t>(std::begin(list), std::end(list))) {}

template<typename T, typename = std::enable_if_t<std::is_integral_v<T>>>
OptDimsType(T v) : std::optional<std::vector<hsize_t>>(std::vector<hsize_t>(1ul, v)) {}
OptDimsType(T v) : std::optional<std::vector<hsize_t>>(std::vector<hsize_t>(1ul, type::safe_cast<hsize_t>(v))) {}

template<typename T, typename = std::enable_if_t<h5pp::type::sfinae::is_iterable_v<T>>>
OptDimsType(T &&dims_)
Expand Down

0 comments on commit 9fa74e7

Please sign in to comment.