File tree Expand file tree Collapse file tree
scripts/docs/en/userver/build Expand file tree Collapse file tree Original file line number Diff line number Diff line change 7474 - name : Run conan
7575 run : |
7676 ${{ matrix.container && 'sudo -u test-user' }} git config --global --add safe.directory `pwd`
77- ${{ matrix.container && 'sudo -u test-user' }} conan create . --update --build=missing --version=`cat version.txt` -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}}
77+ ${{ matrix.container && 'sudo -u test-user' }} conan create . --update --build=missing --version=`cat version.txt` -s:a compiler.cppstd=20 -pr:b=default ${{matrix.conanflags}}
7878
7979 - name : Install test dependencies
8080 if : matrix.os == 'ubuntu-22.04'
@@ -120,7 +120,7 @@ jobs:
120120 s3api \
121121 ; do
122122 mv conanfile.py $SAMPLE/
123- echo "Run: ${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} $SAMPLE/ ${USERVER_VERSION}"
124- ${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} $SAMPLE/ ${USERVER_VERSION}
123+ echo "Run: ${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test --build=never -s:a compiler.cppstd=20 -pr:b=default ${{matrix.conanflags}} $SAMPLE/ ${USERVER_VERSION}"
124+ ${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test --build=never -s:a compiler.cppstd=20 -pr:b=default ${{matrix.conanflags}} $SAMPLE/ ${USERVER_VERSION}
125125 mv $SAMPLE/conanfile.py ./
126126 done
Original file line number Diff line number Diff line change 44
55from conan import ConanFile
66from conan .errors import ConanInvalidConfiguration
7+ from conan .tools .build import check_min_cppstd
78from conan .tools .cmake import CMake
89from conan .tools .cmake import cmake_layout
910from conan .tools .cmake import CMakeDeps
@@ -184,6 +185,8 @@ def build_requirements(self):
184185 self .tool_requires ('protobuf/<host_version>' )
185186
186187 def validate (self ):
188+ check_min_cppstd (self , 20 )
189+
187190 if self .settings .os == 'Windows' :
188191 raise ConanInvalidConfiguration (
189192 'userver cannot be built on Windows' ,
Original file line number Diff line number Diff line change @@ -431,6 +431,7 @@ To build the userver Conan package run the following in the userver root directo
431431
432432` ` ` shell
433433conan profile detect && conan profile show
434+ conan profile update settings.compiler.cppstd=20 default
434435conan create . --build=missing --version=` cat version.txt` -pr:b=default
435436` ` `
436437
You can’t perform that action at this time.
0 commit comments