Skip to content

Commit 242b247

Browse files
committed
Merge branch 'master' into andreylzmw/runtime_light_ci
2 parents 99b437f + 755e510 commit 242b247

22 files changed

+256
-172
lines changed

.github/workflows/Build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ jobs:
2424
asan: off
2525
ubsan: off
2626
light_runtime: off
27-
- os: buster
28-
compiler: clang++-17
29-
cpp: 20
30-
asan: off
31-
ubsan: off
32-
light_runtime: on
3327
- os: focal
3428
compiler: clang++
3529
cpp: 17
@@ -42,8 +36,14 @@ jobs:
4236
asan: on
4337
ubsan: off
4438
light_runtime: off
45-
- os: focal
46-
compiler: g++-10
39+
- os: jammy
40+
compiler: clang++
41+
cpp: 20
42+
asan: off
43+
ubsan: off
44+
light_runtime: on
45+
- os: jammy
46+
compiler: g++-11
4747
cpp: 20
4848
asan: off
4949
ubsan: off
@@ -54,6 +54,7 @@ jobs:
5454
asan: on
5555
ubsan: off
5656
light_runtime: off
57+
5758

5859
name: "${{matrix.os}}/${{matrix.compiler}}/c++${{matrix.cpp}}/asan=${{matrix.asan}}/ubsan=${{matrix.ubsan}}/light_runtime=${{matrix.light_runtime}}"
5960

.github/workflows/Dockerfile.buster

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ RUN apt-get update && \
2222
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \
2323
apt-get update && \
2424
apt-get install -y --no-install-recommends \
25-
git cmake-data=3.18* cmake=3.18* make g++ clang-17 libclang-rt-17-dev gperf netcat \
25+
git cmake-data=3.18* cmake=3.18* make g++ gperf netcat \
2626
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel mysql-server libmysqlclient-dev && \
2727
pip3 install -r /tmp/requirements.txt && \
2828
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 \
2929
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
30-
postgresql postgresql-server-dev-all libnuma-dev composer libstdc++6 libc++-6-dev && \
30+
postgresql postgresql-server-dev-all libnuma-dev composer && \
3131
rm -rf /var/lib/apt/lists/* && \
3232
update-alternatives --set php /usr/bin/php7.4
3333

.github/workflows/Dockerfile.focal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ RUN apt-get update && \
1212
add-apt-repository ppa:deadsnakes/ppa && \
1313
apt-get update && \
1414
apt-get install -y --no-install-recommends \
15-
git cmake make clang g++ g++-10 gperf netcat \
15+
git cmake make g++ g++-10 gperf netcat \
1616
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
1717
python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
1818
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 \
1919
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
20-
postgresql postgresql-server-dev-all libnuma-dev composer unzip libstdc++6 && \
20+
postgresql postgresql-server-dev-all libnuma-dev composer unzip && \
2121
rm -rf /var/lib/apt/lists/*
2222

2323
ENV ASAN_OPTIONS=detect_leaks=0

.github/workflows/Dockerfile.jammy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt update && \
1414
add-apt-repository ppa:deadsnakes/ppa && \
1515
apt update && \
1616
apt install -y --no-install-recommends \
17-
git cmake make g++ lld gperf netcat \
17+
git cmake make g++ g++-11 clang libc++-dev libc++1 lld gperf netcat \
1818
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
1919
python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
2020
apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.DS_Store
99

1010
.idea
11+
.vscode
1112
build
1213
*.iml
1314
/cmake-build-*

cmake/init-compilation-flags.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ add_compile_options(-fdebug-prefix-map="${CMAKE_BINARY_DIR}=${CMAKE_SOURCE_DIR}"
124124

125125
# Light runtime uses C++20 coroutines heavily, so they are required
126126
if(COMPILE_RUNTIME_LIGHT)
127+
add_compile_options(-Wno-unused-result)
127128
get_directory_property(TRY_COMPILE_COMPILE_OPTIONS COMPILE_OPTIONS)
128129
string (REPLACE ";" " " TRY_COMPILE_COMPILE_OPTIONS "${TRY_COMPILE_COMPILE_OPTIONS}")
129130
file(WRITE "${PROJECT_BINARY_DIR}/check_coroutine_include.cpp"

0 commit comments

Comments
 (0)