updated github CI

VKCOM · Nov 8, 2023 · 7e1cc60 · 7e1cc60
1 parent adaba6d
commit 7e1cc60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -24,12 +24,12 @@ jobs:
             asan: off
             ubsan: off
           - os: focal
-            compiler: clang++
+            compiler: g++
             cpp: 17
             asan: off
             ubsan: on
-          - os: focal
-            compiler: g++-10
+          - os: jammy
+            compiler: clang++-17
             cpp: 20
             asan: on
             ubsan: off

diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal
@@ -12,7 +12,7 @@ RUN apt-get update && \
     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 \
+      git cmake make g++ g++-10 gperf netcat \
       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 curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \

diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy
@@ -10,11 +10,13 @@ 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 && \
+    wget -qO /etc/apt/trusted.gpg.d/apt.llvm.org.asc https://apt.llvm.org/llvm-snapshot.gpg.key && \
+    echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" >> /etc/apt/sources.list && \
     add-apt-repository ppa:ondrej/php -y && \
     add-apt-repository ppa:deadsnakes/ppa && \
     apt update && \
     apt install -y --no-install-recommends \
-      git cmake make g++ lld gperf netcat \
+      git cmake make g++ clang-17 libclang-rt-17-dev lld gperf netcat \
       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 install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \