Skip to content

Commit fe6ab19

Browse files
authored
Merge branch 'main' into feature/finish-my-contribution
2 parents 0779dc2 + 73880e9 commit fe6ab19

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/ci_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
}
4747
]
4848
},
49-
{ "cxxversions": ["c++23", "c++20"],
49+
{ "cxxversions": ["c++23"],
5050
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
5151
}
5252
]
5353
},
5454
{ "versions": ["14", "13"],
5555
"tests": [
56-
{ "cxxversions": ["c++26", "c++23", "c++20"],
56+
{ "cxxversions": ["c++26", "c++23"],
5757
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
5858
}
5959
]
@@ -72,7 +72,7 @@ jobs:
7272
}
7373
]
7474
},
75-
{ "cxxversions": ["c++23", "c++20"],
75+
{ "cxxversions": ["c++23"],
7676
"tests": [
7777
{"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
7878
]
@@ -81,7 +81,7 @@ jobs:
8181
},
8282
{ "versions": ["19"],
8383
"tests": [
84-
{ "cxxversions": ["c++26", "c++23", "c++20"],
84+
{ "cxxversions": ["c++26", "c++23"],
8585
"tests": [
8686
{"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
8787
]
@@ -90,7 +90,7 @@ jobs:
9090
},
9191
{ "versions": ["18", "17"],
9292
"tests": [
93-
{ "cxxversions": ["c++26", "c++23", "c++20"],
93+
{ "cxxversions": ["c++26", "c++23"],
9494
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
9595
}
9696
]

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"generator": "Ninja",
88
"binaryDir": "${sourceDir}/build/${presetName}",
99
"cacheVariables": {
10-
"CMAKE_CXX_STANDARD": "20",
10+
"CMAKE_CXX_STANDARD": "23",
1111
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
1212
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "./infra/cmake/use-fetch-content.cmake"
1313
}

0 commit comments

Comments
 (0)