Merge branch 'master' of github.com:google/llvm-premerge-checks
This commit is contained in:
commit
e684ad45c4
3 changed files with 8 additions and 6 deletions
|
@ -2,14 +2,16 @@ FROM debian:testing
|
||||||
|
|
||||||
RUN apt-get update ;\
|
RUN apt-get update ;\
|
||||||
apt-get install -y --no-install-recommends locales \
|
apt-get install -y --no-install-recommends locales \
|
||||||
cmake ninja-build git ca-certificates clang-8 lld-8 ccache python3 build-essential \
|
cmake ninja-build git ca-certificates clang lld ccache python3 build-essential \
|
||||||
clang-tidy-8 clang-format-8 \
|
clang-tidy clang-format \
|
||||||
python3-psutil arcanist zip wget \
|
python3-psutil arcanist zip wget \
|
||||||
openjdk-11-jdk \
|
openjdk-11-jdk \
|
||||||
python3-pip python3-setuptools \
|
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
|
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
|
# required for openssh server
|
||||||
RUN mkdir -p /run/sshd
|
RUN mkdir -p /run/sshd
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ echo "Running linters... ====================================="
|
||||||
cd "${WORKSPACE}"
|
cd "${WORKSPACE}"
|
||||||
# Let clang format apply patches --diff doesn't produces results in the format
|
# Let clang format apply patches --diff doesn't produces results in the format
|
||||||
# we want.
|
# we want.
|
||||||
python3 /usr/bin/git-clang-format-8 --style=llvm --binary=/usr/bin/clang-format-8
|
git-clang-format --style=llvm
|
||||||
set +e
|
set +e
|
||||||
git diff -U0 --exit-code > "${TARGET_DIR}"/clang-format.patch
|
git diff -U0 --exit-code > "${TARGET_DIR}"/clang-format.patch
|
||||||
STATUS="${PIPESTATUS[0]}"
|
STATUS="${PIPESTATUS[0]}"
|
||||||
|
|
|
@ -19,8 +19,8 @@ set -eux
|
||||||
# Outputs: $TARGET_DIR/CMakeCache.txt, $WORKSPACE/compile_commands.json (symlink).
|
# Outputs: $TARGET_DIR/CMakeCache.txt, $WORKSPACE/compile_commands.json (symlink).
|
||||||
|
|
||||||
echo "Running CMake... ======================================"
|
echo "Running CMake... ======================================"
|
||||||
export CC=clang-8
|
export CC=clang
|
||||||
export CXX=clang++-8
|
export CXX=clang++
|
||||||
export LD=LLD
|
export LD=LLD
|
||||||
|
|
||||||
cd "$WORKSPACE"/build
|
cd "$WORKSPACE"/build
|
||||||
|
|
Loading…
Reference in a new issue