Skip to content

Commit 1d72f84

Browse files
committed
fix(r3bdata/alpideData):Fix compilation problem on C++20
Add new badges for CI tests
1 parent d314e53 commit 1d72f84

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
[![CI-CD](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main.yml)
66
[![Static Analysis](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/static_analysis.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/static_analysis.yml)
77
[![Validate Codemeta](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/codemeta_validate.yaml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/codemeta_validate.yaml)
8+
[![CI-CD-nightly](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main-nightly.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main-nightly.yml)
9+
[![CI-CD-nightly-sim](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main-nightly-sim.yml/badge.svg)](https://github.com/R3BRootGroup/R3BRoot/actions/workflows/main-nightly-sim.yml)
810
[![dashboard](https://img.shields.io/badge/dashboard-r3broot-blue?labelColor=gray&style=flat)](https://cdash.gsi.de/index.php?project=R3BRoot)
911

1012
## The R3BRoot Framework
@@ -93,15 +95,15 @@ source util/clang-format-all.sh
9395

9496
The following systems are tested regularly.
9597

96-
| **OS Name** | **Arch** | **OS Version** | **Compiler** | **CMake** |
97-
| --- | --- | --- | --- | --- |
98-
| Almalinux | x86_64 | 9.3 | GCC 11.4.1 | 3.27.9 |
99-
| Almalinux | x86_64 | 9.4 | GCC 14.2.0 | 3.30.6 |
100-
| RHEL | x86_64 | 9.6 | GCC 14.2.0 | 3.30.6 |
101-
| Debian | x86_64 | 10 | GCC 8.3.0 | 3.27.4 & 4.0.3 |
102-
| Debian | x86_64 | 11 | GCC 10.2.1 | 3.27.4 & 3.30.0 |
103-
| Debian | x86_64 | 12 | GCC 12.2.0 | 3.27.4 & 3.30.0 |
104-
| Ubuntu | x86_64 | 24.04 | GCC 13.3.0 | 3.28.3 & 4.0.3 |
98+
| **OS Name** | **Arch** | **OS Version** | **Compiler** | **CMake** | **C++ Version** |
99+
| ----------- | -------- | -------------- | ------------ | --------------- | --------------- |
100+
| Almalinux | x86\_64 | 9.3 | GCC 11.4.1 | 3.27.9 / 4.0.3 | C++17 / C++20 |
101+
| Almalinux | x86\_64 | 9.4 | GCC 14.2.0 | 3.30.6 | C++17 |
102+
| RHEL | x86\_64 | 9.6 | GCC 14.2.0 | 3.30.6 | C++17 |
103+
| Debian | x86\_64 | 10 | GCC 8.3.0 | 3.27.4 / 4.0.3 | C++17 |
104+
| Debian | x86\_64 | 11 | GCC 10.2.1 | 3.27.4 / 3.30.0 | C++17 |
105+
| Debian | x86\_64 | 12 | GCC 12.2.0 | 3.27.4 / 3.30.0 | C++17 |
106+
| Ubuntu | x86\_64 | 24.04 | GCC 13.3.0 | 3.28.3 / 4.0.3 | C++17 |
105107

106108
## Security Policy
107109

r3bdata/alpideData/R3BHmpMappedData.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ R3BHmpMappedData::R3BHmpMappedData(uint32_t TSYS_LO,
4343

4444
std::string R3BHmpMappedData::toString() const
4545
{
46-
return fmt::format("TSLO: {}, Region: {}, TSHI: {}, Volt1: {}, Curr1: {}, Volt2: {}, Curr2: {}, Volt3: {}, Curr3: "
46+
return fmt::format("TSLO: {}, TSHI: {}, Volt1: {}, Curr1: {}, Volt2: {}, Curr2: {}, Volt3: {}, Curr3: "
4747
"{}, Volt4: {}, Curr4: {}",
4848
GetTSLO(),
4949
GetTSHI(),

0 commit comments

Comments
 (0)