Upgrade clang-format-8

4 years ago · 024cd29fdb
parent fdf57e9a7c
commit 024cd29fdb
4 changed files with 18 additions and 6 deletions
--- 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
--- 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


--- 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
--- 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