Skip to content

Commit 26982cd

Browse files
ednolanednolan
committed
Restore a missing Clang 18 unit test
Commit 48638ee was intended to address the unit test issues that occurred when our test images that use older versions of Clang were upgraded to libstdc++ 15, introducing incompatibilities. But among the unit tests it removed, Clang 18/C++23/libstdc++ was removed unnecessarily. This commit adjusts the CI matrix to restore that job.
1 parent b42f14e commit 26982cd

4 files changed

Lines changed: 31 additions & 8 deletions

File tree

‎.github/workflows/ci_tests.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,17 @@ jobs:
9999
}
100100
]
101101
},
102-
{ "versions": ["18", "17"],
102+
{ "versions": ["18"],
103+
"tests": [
104+
{ "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
105+
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
106+
},
107+
{ "cxxversions": ["c++23", "c++20", "c++17"],
108+
"tests": [{"stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
109+
}
110+
]
111+
},
112+
{ "versions": ["17"],
103113
"tests": [
104114
{ "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
105115
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ You can disable building tests by setting CMake option `BEMAN_EXEMPLAR_BUILD_TES
147147
| GCC | 15-13 | C++26-C++17 | libstdc++ |
148148
| GCC | 12-11 | C++23-C++17 | libstdc++ |
149149
| Clang | 22-19 | C++26-C++17 | libstdc++, libc++ |
150-
| Clang | 18-17 | C++26-C++17 | libc++ |
151-
| Clang | 18-17 | C++20, C++17 | libstdc++ |
150+
| Clang | 18 | C++26-C++17 | libc++ |
151+
| Clang | 18 | C++23-C++17 | libstdc++ |
152+
| Clang | 17 | C++26-C++17 | libc++ |
153+
| Clang | 17 | C++20, C++17 | libstdc++ |
152154
| AppleClang | latest | C++26-C++17 | libc++ |
153155
| MSVC | latest | C++23 | MSVC STL |
154156

‎cookiecutter/{{cookiecutter.project_name}}/.github/workflows/ci_tests.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ jobs:
7979
{ "stdlibs": ["libstdc++", "libc++"],
8080
"tests": [
8181
"Debug.Default", "Release.Default", "Release.TSan",
82-
"Release.MaxSan", "Debug.Werror"{% if cookiecutter.library_type == "static" %}, "Debug.Dynamic"{% endif %}
83-
82+
"Release.MaxSan", "Debug.Werror"
8483
]
8584
}
8685
]
@@ -101,7 +100,17 @@ jobs:
101100
}
102101
]
103102
},
104-
{ "versions": ["18", "17"],
103+
{ "versions": ["18"],
104+
"tests": [
105+
{ "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
106+
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
107+
},
108+
{ "cxxversions": ["c++23", "c++20", "c++17"],
109+
"tests": [{"stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
110+
}
111+
]
112+
},
113+
{ "versions": ["17"],
105114
"tests": [
106115
{ "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
107116
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]

‎cookiecutter/{{cookiecutter.project_name}}/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ You can disable building tests by setting CMake option `BEMAN_{{cookiecutter.pro
163163
| GCC | 15-13 | C++26-C++17 | libstdc++ |
164164
| GCC | 12-11 | C++23-C++17 | libstdc++ |
165165
| Clang | 22-19 | C++26-C++17 | libstdc++, libc++ |
166-
| Clang | 18-17 | C++26-C++17 | libc++ |
167-
| Clang | 18-17 | C++20, C++17 | libstdc++ |
166+
| Clang | 18 | C++26-C++17 | libc++ |
167+
| Clang | 18 | C++23-C++17 | libstdc++ |
168+
| Clang | 17 | C++26-C++17 | libc++ |
169+
| Clang | 17 | C++20, C++17 | libstdc++ |
168170
| AppleClang | latest | C++26-C++17 | libc++ |
169171
| MSVC | latest | C++23 | MSVC STL |
170172

0 commit comments

Comments
 (0)