Skip to content

Commit b5f7182

Browse files
committed
test
1 parent 6cbbfc5 commit b5f7182

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

.github/workflows/Build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
strategy:
1919
matrix:
2020
include:
21-
- os: buster
22-
compiler: g++
23-
cpp: 17
24-
asan: off
25-
ubsan: off
26-
light_runtime: off
21+
# - os: buster
22+
# compiler: g++
23+
# cpp: 17
24+
# asan: off
25+
# ubsan: off
26+
# light_runtime: off
2727
- os: focal
2828
compiler: clang++
2929
cpp: 17

.github/workflows/Dockerfile.focal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ RUN apt-get update && \
1616
apt-get update && \
1717
apt-get install -y --no-install-recommends \
1818
git cmake make clang g++ g++-10 g++-11 clang-18 libclang-rt-18-dev gperf netcat \
19-
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
19+
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 && \
2020
python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
21-
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 \
21+
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 \
2222
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
2323
postgresql postgresql-server-dev-all libnuma-dev composer unzip && \
2424
rm -rf /var/lib/apt/lists/*

cmake/init-compilation-flags.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ endif()
106106
add_compile_options(-Werror -Wall -Wextra -Wunused-function -Wfloat-conversion -Wno-sign-compare
107107
-Wuninitialized -Wno-redundant-move -Wno-missing-field-initializers)
108108
if(COMPILE_RUNTIME_LIGHT)
109-
add_compile_options(-Wno-vla-cxx-extension)
110-
if(COMPILER_GCC)
111-
add_compile_options(-Wno-dangling-pointer -Wno-attributes)
112-
endif()
113109
add_compile_options(-Wno-vla-extension)
114110
endif()
115111

cmake/popular-common.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ vk_add_library(light_common OBJECT ${LIGHT_COMMON_SOURCES})
4545
set_property(TARGET light_common PROPERTY POSITION_INDEPENDENT_CODE ON)
4646

4747
if (COMPILE_RUNTIME_LIGHT)
48-
target_compile_options(light_common PUBLIC -stdlib=libc++)
49-
target_link_options(light_common PUBLIC -stdlib=libc++ -static-libstdc++)
48+
if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
49+
target_compile_options(light_common PUBLIC -stdlib=libc++)
50+
target_link_options(light_common PUBLIC -stdlib=libc++ -static-libstdc++)
51+
endif()
5052
endif()
5153

5254
vk_add_library(popular_common OBJECT ${POPULAR_COMMON_SOURCES} ${LIGHT_COMMON_SOURCES})

common/dl-utils-lite.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <time.h>
2323
#include <unistd.h>
2424
#include <dirent.h>
25+
#include <tuple>
2526

2627
#include "common/server/crash-dump.h"
2728
#include "common/stats/provider.h"
@@ -49,9 +50,9 @@ double dl_time() {
4950
}
5051

5152
void dl_print_backtrace(void **trace, int trace_size) {
52-
write (2, "\n------- Stack Backtrace -------\n", 33);
53+
std::ignore = write (2, "\n------- Stack Backtrace -------\n", 33);
5354
backtrace_symbols_fd (trace, trace_size, 2);
54-
write (2, "-------------------------------\n", 32);
55+
std::ignore = write (2, "-------------------------------\n", 32);
5556
}
5657

5758
void dl_print_backtrace() {
@@ -71,7 +72,7 @@ void dl_print_backtrace_gdb() {
7172
name_buf[res] = 0;
7273
int child_pid = fork();
7374
if (child_pid < 0) {
74-
write (2, "Can't fork() to run gdb\n", 24);
75+
std::ignore = write (2, "Can't fork() to run gdb\n", 24);
7576
_exit (0);
7677
}
7778
if (!child_pid) {
@@ -83,7 +84,7 @@ void dl_print_backtrace_gdb() {
8384
waitpid (child_pid, nullptr, 0);
8485
}
8586
} else {
86-
write (2, "can't get name of executable file to pass to gdb\n", 49);
87+
std::ignore = write (2, "can't get name of executable file to pass to gdb\n", 49);
8788
}
8889
}
8990

0 commit comments

Comments
 (0)