From 4d082dbf80340e458347da5c4a9f6afb5677f85f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 25 Jan 2019 15:02:05 +0530 Subject: [PATCH] Split up deps installation for easier maintenance --- .circleci/config.yml | 2 +- .circleci/images/Dockerfile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83bae607a..35ae9c1aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - linux-system-python: + lin-sys: docker: - image: kovidgoyal/kitty-test:latest steps: diff --git a/.circleci/images/Dockerfile b/.circleci/images/Dockerfile index 8acff7f15..8cee6f46c 100644 --- a/.circleci/images/Dockerfile +++ b/.circleci/images/Dockerfile @@ -1,7 +1,12 @@ FROM ubuntu:latest -RUN apt-get update && apt-get install -y libgl1-mesa-dev libxi-dev libxrandr-dev libxinerama-dev libxcursor-dev libxcb-xkb-dev libdbus-1-dev libxkbcommon-dev libharfbuzz-dev libpng-dev libfontconfig-dev libpython3-dev libxkbcommon-x11-dev python3 python3-flake8 python3-pip python3-pil clang git openssh-client make-guile +# System setup +RUN apt-get update && apt-get install -y python3-flake8 python3-pip python3-pil clang git openssh-client make-guile +# kitty deps +RUN apt-get install -y libgl1-mesa-dev libxi-dev libxrandr-dev libxinerama-dev libxcursor-dev libxcb-xkb-dev libdbus-1-dev libxkbcommon-dev libharfbuzz-dev libpng-dev libfontconfig-dev libpython3-dev libxkbcommon-x11-dev python3-pygments + +# Needed to build kitty docs RUN pip3 install sphinx LABEL com.circleci.preserve-entrypoint=true