From 4738f59ba9c1d941dab9e7c0f0ab9bd92fc45619 Mon Sep 17 00:00:00 2001 From: Karim Shamazov Date: Mon, 29 Jun 2026 17:07:34 +0300 Subject: [PATCH 1/4] remove focal --- .github/workflows/Dockerfile.focal | 26 -------------------------- .github/workflows/ubuntu.yml | 4 ++-- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/Dockerfile.focal diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal deleted file mode 100644 index 133422908a..0000000000 --- a/.github/workflows/Dockerfile.focal +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:20.04 -ARG DEBIAN_FRONTEND=noninteractive - -COPY tests/python/requirements.txt /tmp/ - -RUN apt-get update && \ - apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget pkg-config software-properties-common && \ - 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 focal main" >> /etc/apt/sources.list && \ - echo "deb https://apt-archive.postgresql.org/pub/repos/apt focal-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - add-apt-repository ppa:deadsnakes/ppa && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - git cmake make clang g++ g++-10 gperf netcat patch re2c \ - python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ - python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \ - apt-get install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev \ - zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \ - libpq5=14.* postgresql-14 postgresql-server-dev-14 libpq-dev=14.* composer unzip && \ - rm -rf /var/lib/apt/lists/* - -ENV ASAN_OPTIONS=detect_leaks=0 -ENV UBSAN_OPTIONS=print_stacktrace=1:allow_addr2line=1 - -RUN useradd -ms /bin/bash kitten diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a1f4b61fdb..495f1b0bf8 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,12 +17,12 @@ jobs: strategy: matrix: include: - - os: focal + - os: jammy compiler: clang++ cpp: 17 asan: off ubsan: on - - os: focal + - os: jammy compiler: g++-10 cpp: 20 asan: on From f7540a787d746b3d72e29c35fb72963aa8be62ef Mon Sep 17 00:00:00 2001 From: Karim Shamazov Date: Mon, 29 Jun 2026 17:20:16 +0300 Subject: [PATCH 2/4] remove vkpartner links --- .github/workflows/Dockerfile.jammy | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 451bef70fa..6e571fb278 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -8,8 +8,6 @@ COPY tests/python/requirements.txt /tmp/ RUN apt update && \ apt install -y --no-install-recommends apt-utils ca-certificates gnupg wget software-properties-common pkg-config && \ - 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 jammy main" >> /etc/apt/sources.list && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt jammy-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ add-apt-repository ppa:ondrej/php -y && \ From c06c8dd20798a75e8d558911cc48cba4fd5a61c0 Mon Sep 17 00:00:00 2001 From: Karim Shamazov Date: Mon, 29 Jun 2026 17:29:24 +0300 Subject: [PATCH 3/4] add clang --- .github/workflows/Dockerfile.jammy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 6e571fb278..253c62b75e 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -14,7 +14,7 @@ RUN apt update && \ add-apt-repository ppa:deadsnakes/ppa && \ apt update && \ apt install -y --no-install-recommends \ - build-essential devscripts fakeroot git cmake make g++ lld gperf netcat patch re2c \ + build-essential devscripts fakeroot git cmake make clang g++ lld gperf netcat patch re2c \ python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools && \ apt install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev libpcre3-dev \ zlib1g-dev php7.4-dev unzip && \ From a1dad166a3b6467d11bd44e044d18ea53b21c18f Mon Sep 17 00:00:00 2001 From: Karim Shamazov Date: Mon, 29 Jun 2026 17:43:29 +0300 Subject: [PATCH 4/4] add g++-10 --- .github/workflows/Dockerfile.jammy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 253c62b75e..af58a1e4d7 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -14,7 +14,7 @@ RUN apt update && \ add-apt-repository ppa:deadsnakes/ppa && \ apt update && \ apt install -y --no-install-recommends \ - build-essential devscripts fakeroot git cmake make clang g++ lld gperf netcat patch re2c \ + build-essential devscripts fakeroot git cmake make clang g++ g++-10 lld gperf netcat patch re2c \ python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools && \ apt install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev libpcre3-dev \ zlib1g-dev php7.4-dev unzip && \