1
0
Fork 0

Update image to use default clang package

+ add jq to parse conduit responses later
This commit is contained in:
Mikhail Goncharov 2019-12-11 15:42:38 +01:00
parent 663542367b
commit 8e5db1e6bd
3 changed files with 8 additions and 6 deletions

View file

@ -2,14 +2,16 @@ FROM debian:testing
RUN apt-get update ;\
apt-get install -y --no-install-recommends locales \
cmake ninja-build git ca-certificates clang-8 lld-8 ccache python3 build-essential \
clang-tidy-8 clang-format-8 \
cmake ninja-build git ca-certificates clang lld ccache python3 build-essential \
clang-tidy clang-format \
python3-psutil arcanist zip wget \
openjdk-11-jdk \
python3-pip python3-setuptools \
swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync; \
swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq; \
apt-get clean
# Make python3 default (needed by git-clang-format and others).
RUN rm -f /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python
# required for openssh server
RUN mkdir -p /run/sshd

View file

@ -23,7 +23,7 @@ echo "Running linters... ====================================="
cd "${WORKSPACE}"
# Let clang format apply patches --diff doesn't produces results in the format
# we want.
python3 /usr/bin/git-clang-format-8 --style=llvm --binary=/usr/bin/clang-format-8
git-clang-format --style=llvm
set +e
git diff -U0 --exit-code > "${TARGET_DIR}"/clang-format.patch
STATUS="${PIPESTATUS[0]}"

View file

@ -19,8 +19,8 @@ set -eux
# Outputs: $TARGET_DIR/CMakeCache.txt, $WORKSPACE/compile_commands.json (symlink).
echo "Running CMake... ======================================"
export CC=clang-8
export CXX=clang++-8
export CC=clang
export CXX=clang++
export LD=LLD
cd "$WORKSPACE"/build