Merge branch 'master' into andreylzmw/runtime_light_ci

VKCOM · Jul 15, 2024 · ad9d4a0 · ad9d4a0
2 parents 99b437f + 755e510
commit ad9d4a0
Show file tree

Hide file tree

Showing 22 changed files with 256 additions and 172 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -24,12 +24,6 @@ jobs:
             asan: off
             ubsan: off
             light_runtime: off
-          - os: buster
-            compiler: clang++-17
-            cpp: 20
-            asan: off
-            ubsan: off
-            light_runtime: on
           - os: focal
             compiler: clang++
             cpp: 17
@@ -42,8 +36,14 @@ jobs:
             asan: on
             ubsan: off
             light_runtime: off
-          - os: focal
-            compiler: g++-10
+          - os: jammy
+            compiler: clang++
+            cpp: 20
+            asan: off
+            ubsan: off
+            light_runtime: on
+          - os: jammy
+            compiler: g++-11
             cpp: 20
             asan: off
             ubsan: off
@@ -54,6 +54,7 @@ jobs:
             asan: on
             ubsan: off
             light_runtime: off
+
 
     name: "${{matrix.os}}/${{matrix.compiler}}/c++${{matrix.cpp}}/asan=${{matrix.asan}}/ubsan=${{matrix.ubsan}}/light_runtime=${{matrix.light_runtime}}"
 

diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster
@@ -22,12 +22,12 @@ RUN apt-get update && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
-      git cmake-data=3.18* cmake=3.18* make g++ clang-17 libclang-rt-17-dev gperf netcat \
+      git cmake-data=3.18* cmake=3.18* make g++ gperf netcat \
       python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel mysql-server libmysqlclient-dev && \
     pip3 install -r /tmp/requirements.txt && \
     apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
       libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
-      postgresql postgresql-server-dev-all libnuma-dev composer libstdc++6 libc++-6-dev && \
+      postgresql postgresql-server-dev-all libnuma-dev composer && \
     rm -rf /var/lib/apt/lists/* && \
     update-alternatives --set php /usr/bin/php7.4
 

diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal
@@ -12,12 +12,12 @@ RUN apt-get update && \
     add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
-      git cmake make clang g++ g++-10 gperf netcat \
+      git cmake make g++ g++-10 gperf netcat \
       python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
     python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
     apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
       libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
-      postgresql postgresql-server-dev-all libnuma-dev composer unzip libstdc++6 && \
+      postgresql postgresql-server-dev-all libnuma-dev composer unzip && \
     rm -rf /var/lib/apt/lists/*
 
 ENV ASAN_OPTIONS=detect_leaks=0

diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy
@@ -14,7 +14,7 @@ RUN apt update && \
     add-apt-repository ppa:deadsnakes/ppa && \
     apt update && \
     apt install -y --no-install-recommends \
-      git cmake make g++ lld gperf netcat \
+      git cmake make g++ g++-11 clang libc++-14-dev lld gperf netcat \
       python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
     python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
     apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 .DS_Store
 
 .idea
+.vscode
 build
 *.iml
 /cmake-build-*

diff --git a/cmake/init-compilation-flags.cmake b/cmake/init-compilation-flags.cmake
@@ -124,6 +124,7 @@ add_compile_options(-fdebug-prefix-map="${CMAKE_BINARY_DIR}=${CMAKE_SOURCE_DIR}"
 
 # Light runtime uses C++20 coroutines heavily, so they are required
 if(COMPILE_RUNTIME_LIGHT)
+    add_compile_options(-Wno-unused-result)
     get_directory_property(TRY_COMPILE_COMPILE_OPTIONS COMPILE_OPTIONS)
     string (REPLACE ";" " " TRY_COMPILE_COMPILE_OPTIONS "${TRY_COMPILE_COMPILE_OPTIONS}")
     file(WRITE "${PROJECT_BINARY_DIR}/check_coroutine_include.cpp"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     .DS_Store
     .idea
+    .vscode
     build
     *.iml
     /cmake-build-*
@@ Expand Down @@