Merge pull request #15 from JacobDomagala/14-update-to-clang-12

[#14]: Update to clang-12
JacobDomagala · May 26, 2021 · a005c21 · a005c21
2 parents 4036458 + 8544bc8
commit a005c21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker/static_analysis.dockerfile b/docker/static_analysis.dockerfile
@@ -1,22 +1,22 @@
-FROM ubuntu:20.04 as base
+FROM ubuntu:21.04 as base
 
 ENV CXX=clang++
 ENV CC=clang
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y python3 python3-pip git \
-    build-essential clang-11 clang-tidy-11 wget libssl-dev ninja-build && \
+    build-essential clang-12 clang-tidy-12 wget libssl-dev ninja-build && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 RUN pip3 install PyGithub
 
 RUN ln -s \
-    "$(which clang++-11)" \
+    "$(which clang++-12)" \
     /usr/bin/clang++
 
 RUN ln -s \
-    "$(which clang-11)" \
+    "$(which clang-12)" \
     /usr/bin/clang
 
 RUN ln -s \

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -21,10 +21,10 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON "$INPUT_CMAKE_ARGS" ..
 
 if [ -z "$INPUT_EXCLUDE_DIR" ]; then
     eval cppcheck --project=compile_commands.json "$INPUT_CPPCHECK_ARGS" --output-file=cppcheck.txt
-    run-clang-tidy-11 >(tee "clang_tidy.txt")
+    run-clang-tidy-12 >(tee "clang_tidy.txt")
 else
     eval cppcheck --project=compile_commands.json "$INPUT_CPPCHECK_ARGS" --output-file=cppcheck.txt  -i"$GITHUB_WORKSPACE/$INPUT_EXCLUDE_DIR"
-    run-clang-tidy-11 "^((?!$GITHUB_WORKSPACE/$INPUT_EXCLUDE_DIR).)*$" > clang_tidy.txt
+    run-clang-tidy-12 "^((?!$GITHUB_WORKSPACE/$INPUT_EXCLUDE_DIR).)*$" > clang_tidy.txt
 fi
 
 python3 /run_static_analysis.py -cc cppcheck.txt -ct clang_tidy.txt