liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix docker build (#323)

Browse Source 
* fix repos for clang
* fix path for CLANG_FORMAT_BIN in syntax_check.sh
* get version for clang-format
* fix versions for clang-format
This commit is contained in:
rusdacent 2021-02-03 01:15:45 +03:00 committed by GitHub
parent 8836e34840
commit 7481cfd6eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/Dockerfile
View File

@ -3,7 +3,7 @@ FROM ubuntu:18.04
ENV PATH /root/.cargo/bin:$PATH ENV PATH /root/.cargo/bin:$PATH
RUN apt update && \ RUN apt update && \
apt install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
software-properties-common \ software-properties-common \
gpg-agent \ gpg-agent \
make \ make \
@ -26,7 +26,7 @@ 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 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-12 main"
RUN apt update && \ RUN apt update && \
apt install -y --no-install-recommends \ apt install -y --no-install-recommends \

1
docker/syntax_check.sh
View File

@ -18,6 +18,7 @@ C_FILES=$(find . \
-name *.c -o -name *.h -o -name *.cpp) -name *.c -o -name *.h -o -name *.cpp)
ulimit -s 65536 ulimit -s 65536
$CLANG_FORMAT_BIN --version
$CLANG_FORMAT_BIN --verbose -style=file -n --Werror --ferror-limit=0 $C_FILES $CLANG_FORMAT_BIN --verbose -style=file -n --Werror --ferror-limit=0 $C_FILES
c_syntax_rc=$? c_syntax_rc=$?