Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .github/workflows/Dockerfile.focal

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/Dockerfile.jammy
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ 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 && \
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++ 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 && \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading