test

VKCOM · Aug 29, 2024 · b5f7182 · b5f7182
1 parent 6cbbfc5
commit b5f7182
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -18,12 +18,12 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: buster
-            compiler: g++
-            cpp: 17
-            asan: off
-            ubsan: off
-            light_runtime: off
+          # - os: buster
+          #   compiler: g++
+          #   cpp: 17
+          #   asan: off
+          #   ubsan: off
+          #   light_runtime: off
           - os: focal
             compiler: clang++
             cpp: 17

diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal
@@ -16,9 +16,9 @@ RUN apt-get update && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
       git cmake make clang g++ g++-10 g++-11 clang-18 libclang-rt-18-dev 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 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools python3-wheel mysql-server libmysqlclient-dev libc++-dev libc++abi-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 \
+    apt-get install -y --no-install-recommends curl-kphp-vk=20240315.focal.63.build.50 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 && \
     rm -rf /var/lib/apt/lists/*

diff --git a/cmake/init-compilation-flags.cmake b/cmake/init-compilation-flags.cmake
@@ -106,10 +106,6 @@ endif()
 add_compile_options(-Werror -Wall -Wextra -Wunused-function -Wfloat-conversion -Wno-sign-compare
                     -Wuninitialized -Wno-redundant-move -Wno-missing-field-initializers)
 if(COMPILE_RUNTIME_LIGHT)
-    add_compile_options(-Wno-vla-cxx-extension)
-    if(COMPILER_GCC)
-        add_compile_options(-Wno-dangling-pointer -Wno-attributes)
-    endif()
     add_compile_options(-Wno-vla-extension)
 endif()
 

diff --git a/cmake/popular-common.cmake b/cmake/popular-common.cmake
@@ -45,8 +45,10 @@ vk_add_library(light_common OBJECT ${LIGHT_COMMON_SOURCES})
 set_property(TARGET light_common PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 if (COMPILE_RUNTIME_LIGHT)
-    target_compile_options(light_common PUBLIC -stdlib=libc++)
-    target_link_options(light_common PUBLIC -stdlib=libc++ -static-libstdc++)
+    if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
+        target_compile_options(light_common PUBLIC -stdlib=libc++)
+        target_link_options(light_common PUBLIC -stdlib=libc++ -static-libstdc++)
+    endif()
 endif()
 
 vk_add_library(popular_common OBJECT ${POPULAR_COMMON_SOURCES} ${LIGHT_COMMON_SOURCES})

diff --git a/common/dl-utils-lite.cpp b/common/dl-utils-lite.cpp
@@ -22,6 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <tuple>
 
 #include "common/server/crash-dump.h"
 #include "common/stats/provider.h"
@@ -49,9 +50,9 @@ double dl_time() {
 }
 
 void dl_print_backtrace(void **trace, int trace_size) {
-  write (2, "\n------- Stack Backtrace -------\n", 33);
+  std::ignore = write (2, "\n------- Stack Backtrace -------\n", 33);
   backtrace_symbols_fd (trace, trace_size, 2);
-  write (2, "-------------------------------\n", 32);
+  std::ignore = write (2, "-------------------------------\n", 32);
 }
 
 void dl_print_backtrace() {
@@ -71,7 +72,7 @@ void dl_print_backtrace_gdb() {
     name_buf[res] = 0;
     int child_pid = fork();
     if (child_pid < 0) {
-      write (2, "Can't fork() to run gdb\n", 24);
+      std::ignore = write (2, "Can't fork() to run gdb\n", 24);
       _exit (0);
     }
     if (!child_pid) {
@@ -83,7 +84,7 @@ void dl_print_backtrace_gdb() {
       waitpid (child_pid, nullptr, 0);
     }
   } else {
-    write (2, "can't get name of executable file to pass to gdb\n", 49);
+    std::ignore = write (2, "can't get name of executable file to pass to gdb\n", 49);
   }
 }