Skip to content

Commit 99b437f

Browse files
committed
focal+gcc-10 and buster+clang
1 parent c42a920 commit 99b437f

File tree

4 files changed

+46
-11
lines changed

4 files changed

+46
-11
lines changed

.github/workflows/Build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@ jobs:
2525
ubsan: off
2626
light_runtime: off
2727
- os: buster
28-
compiler: g++
29-
cpp: 17
30-
asan: off
31-
ubsan: off
32-
light_runtime: on
33-
- os: buster
34-
compiler: clang++
35-
cpp: 17
28+
compiler: clang++-17
29+
cpp: 20
3630
asan: off
3731
ubsan: off
3832
light_runtime: on
@@ -48,6 +42,12 @@ jobs:
4842
asan: on
4943
ubsan: off
5044
light_runtime: off
45+
- os: focal
46+
compiler: g++-10
47+
cpp: 20
48+
asan: off
49+
ubsan: off
50+
light_runtime: on
5151
- os: jammy
5252
compiler: g++
5353
cpp: 20

.github/workflows/Dockerfile

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM debian:buster
2+
ARG DEBIAN_FRONTEND=noninteractive
3+
4+
RUN apt-get update && \
5+
apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \
6+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
7+
echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \
8+
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-17 main" >> /etc/apt/sources.list && \
9+
echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-17 main" >> /etc/apt/sources.list && \
10+
wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \
11+
echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp buster main" >> /etc/apt/sources.list && \
12+
wget -qO - https://debian.octopuce.fr/snapshots/sury-php/buster-latest/apt.gpg | apt-key add - && \
13+
echo "deb https://debian.octopuce.fr/snapshots/sury-php/buster-latest/ buster main" >> /etc/apt/sources.list && \
14+
TEMP_DEB="$(mktemp)" && \
15+
wget -O "$TEMP_DEB" 'https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb' && \
16+
dpkg -i "$TEMP_DEB" && \
17+
rm -f "$TEMP_DEB" && \
18+
echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
19+
wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
20+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \
21+
apt-get update && \
22+
apt-get install -y --no-install-recommends \
23+
git cmake-data=3.18* cmake=3.18* make g++ clang-17 libclang-rt-17-dev gperf netcat \
24+
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel mysql-server libmysqlclient-dev && \
25+
pip3 install jsonschema && \
26+
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 \
27+
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
28+
postgresql postgresql-server-dev-all libnuma-dev composer libstdc++6 && \
29+
rm -rf /var/lib/apt/lists/* && \
30+
update-alternatives --set php /usr/bin/php7.4
31+
32+
RUN useradd -ms /bin/bash kitten

.github/workflows/Dockerfile.buster

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ COPY tests/python/requirements.txt /tmp/
55

66
RUN apt-get update && \
77
apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \
8+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
89
echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \
10+
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-17 main" >> /etc/apt/sources.list && \
11+
echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-17 main" >> /etc/apt/sources.list && \
912
wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \
1013
echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp buster main" >> /etc/apt/sources.list && \
1114
wget -qO - https://debian.octopuce.fr/snapshots/sury-php/buster-latest/apt.gpg | apt-key add - && \
@@ -19,12 +22,12 @@ RUN apt-get update && \
1922
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \
2023
apt-get update && \
2124
apt-get install -y --no-install-recommends \
22-
git cmake-data=3.18* cmake=3.18* make g++-10 clang++ gperf netcat \
25+
git cmake-data=3.18* cmake=3.18* make g++ clang-17 libclang-rt-17-dev gperf netcat \
2326
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel mysql-server libmysqlclient-dev && \
2427
pip3 install -r /tmp/requirements.txt && \
2528
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 \
2629
libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \
27-
postgresql postgresql-server-dev-all libnuma-dev composer && \
30+
postgresql postgresql-server-dev-all libnuma-dev composer libstdc++6 libc++-6-dev && \
2831
rm -rf /var/lib/apt/lists/* && \
2932
update-alternatives --set php /usr/bin/php7.4
3033

.github/workflows/Dockerfile.focal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && \
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 && \
20+
postgresql postgresql-server-dev-all libnuma-dev composer unzip libstdc++6 && \
2121
rm -rf /var/lib/apt/lists/*
2222

2323
ENV ASAN_OPTIONS=detect_leaks=0

0 commit comments

Comments
 (0)