From 811625e10804cb6a36b5e643b9bb9c1fcb0a8398 Mon Sep 17 00:00:00 2001
From: Anna Weine <anna.weine@mozilla.com>
Date: Fri, 7 Oct 2022 11:25:24 +0000
Subject: Bug 1792821 - Updating the clang-format version to 10. r=jschanck

Differential Revision: https://phabricator.services.mozilla.com/D158323
---
 automation/clang-format/Dockerfile                    | 4 ++--
 automation/clang-format/run_clang_format.sh           | 4 ++--
 automation/taskcluster/docker-builds/Dockerfile       | 4 ++--
 automation/taskcluster/docker-clang-format/Dockerfile | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'automation')

diff --git a/automation/clang-format/Dockerfile b/automation/clang-format/Dockerfile
index 34fc0fb43..9f4f12a63 100644
--- a/automation/clang-format/Dockerfile
+++ b/automation/clang-format/Dockerfile
@@ -5,7 +5,7 @@ LABEL maintainer="Martin Thomson <martin.thomson@gmail.com>"
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     ca-certificates \
-    clang-format-3.9 \
+    clang-format-10 \
     locales \
     python-dev \
     python-pip \
@@ -19,7 +19,7 @@ RUN pip install mercurial==6.1.1
 
 
 RUN update-alternatives --install /usr/bin/clang-format \
-    clang-format $(which clang-format-3.9) 10
+    clang-format $(which clang-format-10) 10
 
 ENV SHELL /bin/bash
 ENV USER worker
diff --git a/automation/clang-format/run_clang_format.sh b/automation/clang-format/run_clang_format.sh
index 378b00ff0..50d4eead7 100755
--- a/automation/clang-format/run_clang_format.sh
+++ b/automation/clang-format/run_clang_format.sh
@@ -54,7 +54,7 @@ for dir in "${dirs[@]}"; do
         if [ "${#c}" == "1" ]; then
             depth+=(-maxdepth 1)
         fi
-        find "$dir" "${depth[@]}" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -i {} \+
+        find "$dir" "${depth[@]}" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -sort-includes=false -i {} \+
     fi
 done
 
@@ -65,4 +65,4 @@ if [[ -d "$top/.hg" ]]; then
 else
     git -C "$top" diff | tee $TMPFILE
 fi
-[[ ! -s $TMPFILE ]]
+[[ ! -s $TMPFILE ]]
\ No newline at end of file
diff --git a/automation/taskcluster/docker-builds/Dockerfile b/automation/taskcluster/docker-builds/Dockerfile
index 1e166317a..63e0165c8 100644
--- a/automation/taskcluster/docker-builds/Dockerfile
+++ b/automation/taskcluster/docker-builds/Dockerfile
@@ -34,7 +34,7 @@ RUN apt-get update \
     pkg-config \
     valgrind \
     zlib1g-dev \
-    clang-format-3.9 \
+    clang-format-10 \
     sqlite3 \ 
     libabigail-dev \
     abigail-tools \
@@ -56,7 +56,7 @@ RUN apt-get update \
  && apt-get autoremove -y && apt-get clean -y
 
 RUN update-alternatives --install /usr/bin/clang-format \
-    clang-format $(which clang-format-3.9) 10
+    clang-format $(which clang-format-10) 10
 
 ENV SHELL /bin/bash
 ENV USER worker
diff --git a/automation/taskcluster/docker-clang-format/Dockerfile b/automation/taskcluster/docker-clang-format/Dockerfile
index c9f8b8b0e..8ef4bb075 100644
--- a/automation/taskcluster/docker-clang-format/Dockerfile
+++ b/automation/taskcluster/docker-clang-format/Dockerfile
@@ -1,18 +1,18 @@
-# Minimal image with clang-format 3.9.
+# Minimal image with clang-format 10
 FROM ubuntu:18.04
 LABEL maintainer="Martin Thomson <martin.thomson@gmail.com>"
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     ca-certificates \
-    clang-format-3.9 \
+    clang-format-10 \
     locales \
     mercurial \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get autoremove -y && apt-get clean -y
 
 RUN update-alternatives --install /usr/bin/clang-format \
-    clang-format $(which clang-format-3.9) 10
+    clang-format $(which clang-format-10) 10
 
 ENV SHELL /bin/bash
 ENV USER worker
-- 
cgit v1.2.1