From 024cd29fdbcec5301f52efa06a3353d9eaecae4e Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 16 Oct 2020 10:59:39 -0700 Subject: [PATCH] Upgrade clang-format-8 --- .../dockerfile/grpc_clang_format/Dockerfile.template | 8 +++++++- .../tools/dockerfile/test/sanity/Dockerfile.template | 4 ++-- tools/dockerfile/grpc_clang_format/Dockerfile | 8 +++++++- tools/dockerfile/test/sanity/Dockerfile | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template index d34837da125..9216235c924 100644 --- a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template @@ -16,7 +16,13 @@ FROM debian:10 - RUN apt-get update && apt-get install -y clang-format + # 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-format + RUN apt-get update && apt-get install -y clang-format-8 + ENV CLANG_FORMAT=clang-format-8 + ADD clang_format_all_the_things.sh / # When running locally, we'll be impersonating the current user, so we need diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 3466ceebd23..17c6d048274 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -37,8 +37,8 @@ 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 update && apt-get install -y clang clang-format-7 clang-tidy-8 jq - ENV CLANG_FORMAT=clang-format-7 + RUN apt-get update && apt-get install -y clang clang-format-8 clang-tidy-8 jq + ENV CLANG_FORMAT=clang-format-8 ENV CLANG_TIDY=clang-tidy-8 diff --git a/tools/dockerfile/grpc_clang_format/Dockerfile b/tools/dockerfile/grpc_clang_format/Dockerfile index 69ec2027fe0..acc784ada63 100644 --- a/tools/dockerfile/grpc_clang_format/Dockerfile +++ b/tools/dockerfile/grpc_clang_format/Dockerfile @@ -14,7 +14,13 @@ FROM debian:10 -RUN apt-get update && apt-get install -y clang-format +# 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-format +RUN apt-get update && apt-get install -y clang-format-8 +ENV CLANG_FORMAT=clang-format-8 + ADD clang_format_all_the_things.sh / # When running locally, we'll be impersonating the current user, so we need diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index dd94acf7835..2d4c243b749 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -85,8 +85,8 @@ RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml 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 update && apt-get install -y clang clang-format-7 clang-tidy-8 jq -ENV CLANG_FORMAT=clang-format-7 +RUN apt-get update && apt-get install -y clang clang-format-8 clang-tidy-8 jq +ENV CLANG_FORMAT=clang-format-8 ENV CLANG_TIDY=clang-tidy-8