feat build: drop C++17 support

apolukhin · apolukhin · commit 18106efe8b36 · 2026-04-01T12:05:44.000+03:00
Tests: протестировано CI
commit_hash:e180290a3ea82b3c534100f3b1edc6463ec5ed0b
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -29,7 +29,7 @@ jobs:
             CMAKE_PROGRAM_PATH: /usr/lib/llvm19/bin
             CMAKE_FLAGS: >-
                 -DCMAKE_BUILD_TYPE=Debug
-                -DCMAKE_CXX_STANDARD=17
+                -DCMAKE_CXX_STANDARD=20
                 -DUSERVER_USE_LD=lld
                 -DUSERVER_NO_WERROR=OFF
                 -DUSERVER_BUILD_ALL_COMPONENTS=1
diff --git a/.github/workflows/archlinux.yml b/.github/workflows/archlinux.yml
@@ -30,7 +30,7 @@ jobs:
         env:
             CMAKE_FLAGS: >-
                 -DCMAKE_BUILD_TYPE=Debug
-                -DCMAKE_CXX_STANDARD=17
+                -DCMAKE_CXX_STANDARD=20
                 -DUSERVER_USE_LD=lld
                 -DUSERVER_NO_WERROR=1
                 -DUSERVER_BUILD_ALL_COMPONENTS=1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
                         -DCMAKE_CXX_COMPILER=clang++-18
                         -DCMAKE_C_COMPILER=clang-18
                         -DCMAKE_BUILD_TYPE=Debug
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DUSERVER_SANITIZE="ub addr"
                         -DUSERVER_NO_WERROR=0
                         -DUSERVER_BUILD_ALL_COMPONENTS=1
@@ -51,7 +51,7 @@ jobs:
                         -DCMAKE_CXX_COMPILER=g++-13
                         -DCMAKE_C_COMPILER=gcc-13
                         -DCMAKE_BUILD_TYPE=Release
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DUSERVER_SANITIZE=""
                         -DUSERVER_NO_WERROR=1
                         -DUSERVER_BUILD_ALL_COMPONENTS=1
@@ -68,7 +68,7 @@ jobs:
                         -DCMAKE_CXX_COMPILER=clang++-14
                         -DCMAKE_C_COMPILER=clang-14
                         -DCMAKE_BUILD_TYPE=Debug
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DUSERVER_SANITIZE="ub addr"
                         -DUSERVER_NO_WERROR=0
                         -DUSERVER_BUILD_ALL_COMPONENTS=1
@@ -90,7 +90,7 @@ jobs:
                         -DCMAKE_CXX_COMPILER=g++-10
                         -DCMAKE_C_COMPILER=gcc-10
                         -DCMAKE_BUILD_TYPE=Release
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DUSERVER_USE_LD=gold
                         -DUSERVER_BUILD_ALL_COMPONENTS=1
                         -DUSERVER_BUILD_SAMPLES=1
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -61,7 +61,7 @@ jobs:
         env:
             CMAKE_FLAGS: >-
                 -DCMAKE_BUILD_TYPE=Debug
-                -DCMAKE_CXX_STANDARD=17
+                -DCMAKE_CXX_STANDARD=20
                 -DUSERVER_USE_LD=lld
                 -DUSERVER_NO_WERROR=OFF
                 -DUSERVER_BUILD_ALL_COMPONENTS=1
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -15,7 +15,7 @@ jobs:
             matrix:
                 include:
                   - cmake-flags: >-
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DCPM_SOURCE_CACHE=/userver/.cpm
                         -DUSERVER_USE_LD=gold
                         -DUSERVER_NO_WERROR=0
@@ -25,12 +25,12 @@ jobs:
                         -DCMAKE_BUILD_TYPE=Release
                     gtest-filter: '*'
                     image: ubuntu-22.04-userver-base
-                    info: ubuntu + gcc + cxx17 + core
-                    id: ubuntu_gcc_cxx17_core
+                    info: ubuntu + gcc + cxx20 + core
+                    id: ubuntu_gcc_cxx20_core
                   - cmake-flags: >-
                         -DCMAKE_C_COMPILER=clang-16
                         -DCMAKE_CXX_COMPILER=clang++-16
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DCPM_SOURCE_CACHE=/userver/.cpm
                         -DUSERVER_NO_WERROR=0
                         -DUSERVER_BUILD_ALL_COMPONENTS=1
@@ -40,12 +40,12 @@ jobs:
                         -DCMAKE_BUILD_TYPE=Release
                     gtest-filter: '*'
                     image: ubuntu-22.04-userver-base-ci
-                    info: ubuntu + clang-16 + cxx17
-                    id: ubuntu_clang16_cxx17
+                    info: ubuntu + clang-16 + cxx20
+                    id: ubuntu_clang16_cxx20
                   - cmake-flags: >-
                         -DCMAKE_C_COMPILER=gcc-11
                         -DCMAKE_CXX_COMPILER=g++-11
-                        -DCMAKE_CXX_STANDARD=17
+                        -DCMAKE_CXX_STANDARD=20
                         -DCPM_SOURCE_CACHE=/userver/.cpm
                         -DUSERVER_USE_LD=gold
                         -DUSERVER_NO_WERROR=0
@@ -56,8 +56,8 @@ jobs:
                         -DCMAKE_BUILD_TYPE=Release
                     gtest-filter: '*'
                     image: ubuntu-22.04-userver-base-ci
-                    info: ubuntu + gcc-11 + cxx17
-                    id: ubuntu_gcc11_cxx17
+                    info: ubuntu + gcc-11 + cxx20
+                    id: ubuntu_gcc11_cxx20
                   - cmake-flags: >-
                         -DCMAKE_C_COMPILER=clang-16
                         -DCMAKE_CXX_COMPILER=clang++-16
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -35,7 +35,7 @@ jobs:
         env:
             CMAKE_FLAGS: >-
                 -DCMAKE_BUILD_TYPE=Debug
-                -DCMAKE_CXX_STANDARD=17
+                -DCMAKE_CXX_STANDARD=20
                 -DUSERVER_USE_LD=lld
                 -DUSERVER_BUILD_ALL_COMPONENTS=1
                 -DUSERVER_BUILD_SAMPLES=1
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -25,7 +25,7 @@ jobs:
             CMAKE_FLAGS: >-
                 -GNinja
                 -DCMAKE_BUILD_TYPE=Debug
-                -DCMAKE_CXX_STANDARD=17
+                -DCMAKE_CXX_STANDARD=20
                 -DUSERVER_NO_WERROR=1
                 -DUSERVER_BUILD_ALL_COMPONENTS=1
                 -DUSERVER_BUILD_SAMPLES=1
diff --git a/.github/workflows/ubuntu-minimal.yml b/.github/workflows/ubuntu-minimal.yml
@@ -24,7 +24,7 @@ jobs:
         env:
             CMAKE_FLAGS: >-
                 -DCMAKE_BUILD_TYPE=Debug
-                -DCMAKE_CXX_STANDARD=17
+                -DCMAKE_CXX_STANDARD=20
                 -DUSERVER_SANITIZE="ub addr"
                 -DUSERVER_BUILD_SAMPLES=1
                 -DUSERVER_BUILD_TESTS=1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,11 +88,7 @@ if(USERVER_FEATURE_CORE
 endif()
 
 set(USERVER_YDB_DEFAULT OFF)
-if(USERVER_FEATURE_CORE
-   AND USERVER_BUILD_ALL_COMPONENTS
-   AND DEFINED CMAKE_CXX_STANDARD
-   AND CMAKE_CXX_STANDARD GREATER_EQUAL 20
-)
+if(USERVER_FEATURE_CORE AND USERVER_BUILD_ALL_COMPONENTS)
     set(USERVER_YDB_DEFAULT ON)
 endif()
 
diff --git a/cmake/UserverRequireDWCAS.cmake b/cmake/UserverRequireDWCAS.cmake
@@ -17,7 +17,7 @@ function(userver_target_require_dwcas target visibility)
         return()
     endif()
 
-    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 20)
     set(TEST_DEFINITIONS)
     set(TEST_LIBRARIES)
 
diff --git a/cmake/UserverSetupEnvironment.cmake b/cmake/UserverSetupEnvironment.cmake
@@ -68,6 +68,11 @@ function(_userver_setup_environment_impl)
             PARENT_SCOPE
         )
     endif()
+
+    if(CMAKE_CXX_STANDARD LESS 20)
+        message(FATAL_ERROR "userver requires CMAKE_CXX_STANDARD >= 20 (got: ${CMAKE_CXX_STANDARD})")
+    endif()
+
     message(STATUS "C++ standard ${CMAKE_CXX_STANDARD}")
     set(CMAKE_CXX_STANDARD_REQUIRED
         ON
diff --git a/scripts/docker/base-ubuntu-22.04-ci.dockerfile b/scripts/docker/base-ubuntu-22.04-ci.dockerfile
@@ -22,7 +22,7 @@ RUN \
     rabbitmq-server \
     redis-server \
     clang-16 lld-16 llvm-16 clang-format-16 libclang-rt-16-dev\
-    clang-14 lld-14 llvm clang-format-18 \
+    clang-15 lld-15 llvm-15 clang-format-18 \
     g++-10 gcc-10 \
     g++-11 gcc-11 \
     g++-13 gcc-13 \
diff --git a/scripts/docker/ubuntu_install_grpc.sh b/scripts/docker/ubuntu_install_grpc.sh
@@ -26,7 +26,7 @@ git clone --recurse-submodules -b ${GRPC_VERSION} --depth 1 --shallow-submodules
   cmake \
     -DgRPC_INSTALL=ON \
     -DgRPC_BUILD_TESTS=OFF \
-    -DCMAKE_CXX_STANDARD=17 \
+    -DCMAKE_CXX_STANDARD=20 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
diff --git a/third_party/librseq/CMakeLists.txt b/third_party/librseq/CMakeLists.txt
@@ -5,7 +5,7 @@ set(SOURCES src/rseq.c src/rseq-mempool.c src/smp.c)
 add_library(${PROJECT_NAME} OBJECT ${SOURCES})
 
 target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
-target_compile_options(${PROJECT_NAME} PRIVATE -Wno-implicit-function-declaration)
+target_compile_options(${PROJECT_NAME} PRIVATE -Wno-implicit-function-declaration -Wno-error=pedantic)
 target_compile_definitions(${PROJECT_NAME} PRIVATE _GNU_SOURCE)
 set_target_properties(${PROJECT_NAME} PROPERTIES C_EXTENSIONS ON)
 _userver_install_targets(COMPONENT core TARGETS ${PROJECT_NAME})
diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
@@ -58,13 +58,8 @@ endif()
 # cmake/UserverSetupEnvironment.cmake
 add_library(userver-internal-compile-options INTERFACE)
 userver_target_require_dwcas(userver-internal-compile-options INTERFACE)
-target_compile_features(userver-internal-compile-options INTERFACE cxx_std_17)
-target_compile_options(userver-internal-compile-options INTERFACE "-Wall" "-Wextra")
-
-# as alternative for -Wno-gnu-zero-variadic-macro-arguments
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_STANDARD GREATER_EQUAL 20)
-    target_compile_options(userver-internal-compile-options INTERFACE "-Wpedantic")
-endif()
+target_compile_features(userver-internal-compile-options INTERFACE cxx_std_20)
+target_compile_options(userver-internal-compile-options INTERFACE "-Wall" "-Wextra" "-Wpedantic")
 
 include(UserverCxxCompileOptionsIfSupported)
 userver_target_cxx_compile_options_if_supported(
@@ -80,8 +75,6 @@ userver_target_cxx_compile_options_if_supported(
     "-Wno-error=deprecated-declarations"
     # This warning is unavoidable in generic code with templates
     "-Wno-useless-cast"
-    # Starting from C++20, passing zero arguments to a variadic macro parameter is allowed
-    "-Wno-gnu-zero-variadic-macro-arguments"
     # gcc complains: the ABI of passing union with ‘long double’ has changed in GCC 4.4
     "-Wno-psabi"
 )
diff --git a/ydb/CMakeLists.txt b/ydb/CMakeLists.txt
@@ -28,12 +28,6 @@ userver_module(
     EMBED_FILES src/ydb/component.yaml src/ydb/dist_lock/component_base.yaml
 )
 
-# Enforce that userver-ydb requires C++20
-target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
-if(CMAKE_CXX_STANDARD LESS 20)
-    message(FATAL_ERROR "YDB driver requires CMAKE_CXX_STANDARD >= 20 (got: ${CMAKE_CXX_STANDARD})")
-endif()
-
 _userver_directory_install(
     COMPONENT ydb
     FILES "${USERVER_ROOT_DIR}/cmake/SetupYdbCPPSDK.cmake"
