diff --git a/.circleci/config.yml b/.circleci/config.yml index 837d3a3ac..f778bb5b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,7 @@ version: 2 + jobs: + lin-sys: docker: - image: kovidgoyal/kitty-test:latest @@ -12,21 +14,25 @@ jobs: - run: make FAIL_WARN=-W man - run: make FAIL_WARN=-W html - run: python3 setup.py linux-package + lin-35: docker: - image: kovidgoyal/kitty-test:latest environ: CC: gcc CFLAGS: -funsigned-char + LD_LIBRARY_PATH: /opt/py3.5/lib:$LD_LIBRARY_PATH steps: - checkout - run: /opt/py3.5/bin/python3 setup.py build --debug --verbose --sanitize - run: ./asan-launcher test.py + lin-37: docker: - image: kovidgoyal/kitty-test:latest environ: CC: clang + LD_LIBRARY_PATH: /opt/py3.7/lib:$LD_LIBRARY_PATH steps: - checkout - run: /opt/py3.7/bin/python3 setup.py build --debug --verbose --sanitize diff --git a/.circleci/images/Dockerfile b/.circleci/images/Dockerfile index 5b839f253..e901185e9 100644 --- a/.circleci/images/Dockerfile +++ b/.circleci/images/Dockerfile @@ -3,7 +3,8 @@ FROM ubuntu:latest # make Apt non-interactive ENV DEBIAN_FRONTEND=noninteractive RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \ - && echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci + && echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci \ + && echo 'Acquire::Languages "none";' >> /etc/apt/apt.conf.d/90circleci # System setup RUN apt-get update && mkdir -p /usr/share/man/man1 && apt-get install -y python3-flake8 python3-pip python3-pil clang git apt locales sudo openssh-client ca-certificates tar gzip parallel net-tools netcat unzip zip bzip2 gnupg curl wget build-essential apt-utils @@ -42,6 +43,9 @@ ENV SW=/home/circleci/sw RUN mkdir $SW && \ curl https://download.calibre-ebook.com/travis/kitty/linux-64.tar.xz | tar xJ -C $SW +# Clean unused files +RUN apt-get clean -y + USER circleci LABEL com.circleci.preserve-entrypoint=true