From 7d9672bb2d1c905ae556acf78a0fdd3562a2e926 Mon Sep 17 00:00:00 2001
From: rusdacent <rusdacentx0x08@gmail.com>
Date: Tue, 20 Oct 2020 05:58:22 +0300
Subject: [PATCH 1/4] refs #146 update version clang-format

---
 docker/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f5918029..c1b815d0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,6 +4,8 @@ ENV PATH /root/.cargo/bin:$PATH
 
 RUN apt update && \
     apt install -y --no-install-recommends \
+        software-properties-common \
+        gpg-agent \
         make \
         gcc-arm-none-eabi \
         binutils-arm-none-eabi \
@@ -19,11 +21,17 @@ RUN apt update && \
         python \
         python-pip \
         libstdc++-arm-none-eabi-newlib \
-        libclang-10-dev \
-        clang-format-10 \
         git \
         && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
+
+RUN apt update && \
+    apt install -y --no-install-recommends \
+        libclang-11-dev \
+        clang-format-11 \
+        && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf && \
     rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
 

From 2b513d381b6123637cfdc1aec5074435b3a42a97 Mon Sep 17 00:00:00 2001
From: rusdacent <rusdacentx0x08@gmail.com>
Date: Tue, 20 Oct 2020 08:38:53 +0300
Subject: [PATCH 2/4] refs #146 fix path for clang-format in syntax-check

---
 docker/syntax_check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/syntax_check.sh b/docker/syntax_check.sh
index 0294b696..d45b41b7 100755
--- a/docker/syntax_check.sh
+++ b/docker/syntax_check.sh
@@ -2,7 +2,7 @@
 
 # set -e
 
-CLANG_FORMAT_BIN="/usr/bin/clang-format-10"
+CLANG_FORMAT_BIN="/usr/bin/clang-format-11"
 PATH="$HOME/.cargo/bin:${PATH}"
 
 PROJECT_DIR=$(pwd)

From ebd712015123a37ab97034723a3409f63d062c8e Mon Sep 17 00:00:00 2001
From: rusdacent <rusdacentx0x08@gmail.com>
Date: Tue, 20 Oct 2020 13:41:00 +0300
Subject: [PATCH 3/4] refs #146 bump clang-format version to 12

---
 docker/Dockerfile      | 6 +++---
 docker/syntax_check.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c1b815d0..22174fbc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,12 +24,12 @@ RUN apt update && \
         git \
         && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
+RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main"
 
 RUN apt update && \
     apt install -y --no-install-recommends \
-        libclang-11-dev \
-        clang-format-11 \
+        libclang-12-dev \
+        clang-format-12 \
         && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf && \
diff --git a/docker/syntax_check.sh b/docker/syntax_check.sh
index d45b41b7..e7be6a8e 100755
--- a/docker/syntax_check.sh
+++ b/docker/syntax_check.sh
@@ -2,7 +2,7 @@
 
 # set -e
 
-CLANG_FORMAT_BIN="/usr/bin/clang-format-11"
+CLANG_FORMAT_BIN="/usr/bin/clang-format-12"
 PATH="$HOME/.cargo/bin:${PATH}"
 
 PROJECT_DIR=$(pwd)

From e95db0eeddd246d54bb1dec19b340bfde3431cab Mon Sep 17 00:00:00 2001
From: aanper <mail@s3f.ru>
Date: Wed, 21 Oct 2020 12:08:23 +0300
Subject: [PATCH 4/4] update AllowShortBlocksOnASingleLine param (not work)

---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 756e3ff9..6a2af9ee 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,7 +6,7 @@ AlignEscapedNewlines: Left
 AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: true