From 994c2047e9ee798d5519d773130ea98edecf57cd Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 22 Sep 2020 10:05:18 -0700 Subject: [PATCH] Bump to clang-tidy-8 --- .../tools/dockerfile/grpc_clang_tidy/Dockerfile.template | 7 +++++-- templates/tools/dockerfile/test/sanity/Dockerfile.template | 7 +++++-- tools/dockerfile/grpc_clang_tidy/Dockerfile | 7 +++++-- tools/dockerfile/test/sanity/Dockerfile | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template index 195a7b936ee..b3a363606ea 100644 --- a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template @@ -16,9 +16,12 @@ <%include file="../python_debian10.include"/> + # Add buster-backports for more recent clang packages + RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list + # Install clang-tidy 7 - RUN apt-get update && apt-get install -y clang-tidy-7 jq - ENV CLANG_TIDY=clang-tidy-7 + RUN apt-get update && apt-get install -y clang-tidy-8 jq + ENV CLANG_TIDY=clang-tidy-8 ADD clang_tidy_all_the_things.sh / diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index c486a9821ed..3466ceebd23 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -33,10 +33,13 @@ RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml + # Add buster-backports for more recent clang packages + RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list + # Install clang, clang-format, and clang-tidy - RUN apt-get install -y clang clang-format-7 clang-tidy-7 jq + RUN apt-get update && apt-get install -y clang clang-format-7 clang-tidy-8 jq ENV CLANG_FORMAT=clang-format-7 - ENV CLANG_TIDY=clang-tidy-7 + ENV CLANG_TIDY=clang-tidy-8 <%include file="../../bazel.include"/> diff --git a/tools/dockerfile/grpc_clang_tidy/Dockerfile b/tools/dockerfile/grpc_clang_tidy/Dockerfile index 4c47e8dc7fa..662ff8a697d 100644 --- a/tools/dockerfile/grpc_clang_tidy/Dockerfile +++ b/tools/dockerfile/grpc_clang_tidy/Dockerfile @@ -61,9 +61,12 @@ RUN mkdir /var/local/jenkins +# Add buster-backports for more recent clang packages +RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list + # Install clang-tidy 7 -RUN apt-get update && apt-get install -y clang-tidy-7 jq -ENV CLANG_TIDY=clang-tidy-7 +RUN apt-get update && apt-get install -y clang-tidy-8 jq +ENV CLANG_TIDY=clang-tidy-8 ADD clang_tidy_all_the_things.sh / diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index ccfd6f08b6b..dd94acf7835 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -81,10 +81,13 @@ RUN apt-get update && apt-get install -y \ RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml +# Add buster-backports for more recent clang packages +RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list + # Install clang, clang-format, and clang-tidy -RUN apt-get install -y clang clang-format-7 clang-tidy-7 jq +RUN apt-get update && apt-get install -y clang clang-format-7 clang-tidy-8 jq ENV CLANG_FORMAT=clang-format-7 -ENV CLANG_TIDY=clang-tidy-7 +ENV CLANG_TIDY=clang-tidy-8 #========================