diff --git a/.drone.jsonnet b/.drone.jsonnet index b35b1598d..06e479e5a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -217,7 +217,7 @@ local mac_builder(name, build_type='Release', werror=true, cmake_extra='', extra 'echo "Building on ${DRONE_STAGE_MACHINE}"', apt_get_quiet + ' update', apt_get_quiet + ' install -y eatmydata', - 'eatmydata ' + apt_get_quiet + ' install -y git clang-format-9', + 'eatmydata ' + apt_get_quiet + ' install -y git clang-format-11', './contrib/ci/drone-format-verify.sh'] }] }, diff --git a/contrib/ci/docker/lint.dockerfile b/contrib/ci/docker/lint.dockerfile index a9200c3c1..f247fd6a7 100644 --- a/contrib/ci/docker/lint.dockerfile +++ b/contrib/ci/docker/lint.dockerfile @@ -1,3 +1,3 @@ FROM debian:sid RUN /bin/bash -c 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections' -RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q update && apt-get -o=Dpkg::Use-Pty=0 -q install -y eatmydata git clang-format-9' \ No newline at end of file +RUN /bin/bash -c 'apt-get -o=Dpkg::Use-Pty=0 -q update && apt-get -o=Dpkg::Use-Pty=0 -q install -y eatmydata git clang-format-11' diff --git a/contrib/ci/drone-format-verify.sh b/contrib/ci/drone-format-verify.sh index 09062a369..68a7ac620 100755 --- a/contrib/ci/drone-format-verify.sh +++ b/contrib/ci/drone-format-verify.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash test "x$IGNORE" != "x" && exit 0 repo=$(readlink -e $(dirname $0)/../../) -clang-format-9 -i $(find $repo/jni $repo/daemon $repo/llarp $repo/include $repo/pybind | grep -E '\.[hc](pp)?$') +clang-format-11 -i $(find $repo/jni $repo/daemon $repo/llarp $repo/include $repo/pybind | grep -E '\.[hc](pp)?$') git --no-pager diff --exit-code --color || (echo -ne '\n\n\e[31;1mLint check failed; please run ./contrib/format.sh\e[0m\n\n' ; exit 1) diff --git a/contrib/format.sh b/contrib/format.sh index 6cb8b0ff8..ed3936857 100755 --- a/contrib/format.sh +++ b/contrib/format.sh @@ -2,4 +2,4 @@ # TODO: readlink -e is a GNU-ism cd "$(readlink -e $(dirname $0)/../)" -clang-format-9 -i $(find jni daemon llarp include pybind | grep -E '\.[hc](pp)?$') &> /dev/null +clang-format-11 -i $(find jni daemon llarp include pybind | grep -E '\.[hc](pp)?$') &> /dev/null