Просмотр исходного кода

refs #146 bump clang-format version to 12

rusdacent 5 лет назад
Родитель
Сommit
ebd7120151
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      docker/Dockerfile
  2. 1 1
      docker/syntax_check.sh

+ 3 - 3
docker/Dockerfile

@@ -24,12 +24,12 @@ RUN apt update && \
         git \
         git \
         && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
         && 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 && \
 RUN apt update && \
     apt install -y --no-install-recommends \
     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/*
         && 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 && \
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf && \

+ 1 - 1
docker/syntax_check.sh

@@ -2,7 +2,7 @@
 
 
 # set -e
 # set -e
 
 
-CLANG_FORMAT_BIN="/usr/bin/clang-format-11"
+CLANG_FORMAT_BIN="/usr/bin/clang-format-12"
 PATH="$HOME/.cargo/bin:${PATH}"
 PATH="$HOME/.cargo/bin:${PATH}"
 
 
 PROJECT_DIR=$(pwd)
 PROJECT_DIR=$(pwd)