From 7bc048f2b7cf966f20616a9c597267bc54874528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=83=D1=82=D1=8E=D0=BD=D1=8F=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=87?= Date: Thu, 11 Jul 2024 06:14:58 +0300 Subject: [PATCH] focal+gcc-10 and buster+clang --- .github/workflows/Build.yml | 16 ++++++++-------- .github/workflows/Dockerfile.buster | 7 +++++-- .github/workflows/Dockerfile.focal | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 14c8941479..1a8a23f353 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -25,14 +25,8 @@ jobs: ubsan: off light_runtime: off - os: buster - compiler: g++ - cpp: 17 - asan: off - ubsan: off - light_runtime: on - - os: buster - compiler: clang++ - cpp: 17 + compiler: clang++-17 + cpp: 20 asan: off ubsan: off light_runtime: on @@ -48,6 +42,12 @@ jobs: asan: on ubsan: off light_runtime: off + - os: focal + compiler: g++-10 + cpp: 20 + asan: off + ubsan: off + light_runtime: on - os: jammy compiler: g++ cpp: 20 diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 432855b3c9..f5a8a86d34 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -5,7 +5,10 @@ COPY tests/python/requirements.txt /tmp/ RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ + wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ + echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-17 main" >> /etc/apt/sources.list && \ + echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-17 main" >> /etc/apt/sources.list && \ wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \ echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp buster main" >> /etc/apt/sources.list && \ wget -qO - https://debian.octopuce.fr/snapshots/sury-php/buster-latest/apt.gpg | apt-key add - && \ @@ -19,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++-10 clang++ gperf netcat \ + git cmake-data=3.18* cmake=3.18* make g++ clang-17 libclang-rt-17-dev 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 && \ + postgresql postgresql-server-dev-all libnuma-dev composer libstdc++6 && \ 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 index 255e51a82d..e3f1cd848a 100644 --- a/.github/workflows/Dockerfile.focal +++ b/.github/workflows/Dockerfile.focal @@ -17,7 +17,7 @@ RUN apt-get update && \ 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 && \ + postgresql postgresql-server-dev-all libnuma-dev composer unzip libstdc++6 && \ rm -rf /var/lib/apt/lists/* ENV ASAN_OPTIONS=detect_leaks=0