diff options
author | Albert Astals Cid <aacid@kde.org> | 2021-04-21 16:42:09 +0200 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2021-04-22 17:52:12 +0200 |
commit | d5ab9b5dbf0024f269001fcea87f4d01a44c2ec6 (patch) | |
tree | 30badf6405d33cf67953b4991a3658686142c290 | |
parent | aad32f4999eb3fb6aa5b8d0485af9fabc98bb01a (diff) |
CI: Use clang-12
Disable new performance-no-int-to-ptr clang-tidy check since it triggers
too many issues deep in too many places
-rw-r--r-- | .gitlab-ci.yml | 18 | ||||
-rw-r--r-- | README.contributors | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59b9dac6..5ca5ac34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ before_script: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends poppler - - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libc++-dev libc++abi-dev clang libgtk-3-dev clang-tidy wget p7zip-full libbrotli-dev + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full libbrotli-dev - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen - locale-gen @@ -30,9 +30,9 @@ clang_format: stage: build before_script: - apt-get update - - apt-get install --yes --no-install-recommends git clang-format-11 + - apt-get install --yes --no-install-recommends git clang-format-12 script: - - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-11 -i {} \; + - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-12 -i {} \; - git diff --exit-code build: @@ -48,14 +48,14 @@ build: - ninja - ctest --output-on-failure -build_clang_libcpp: +build_clang12_libcpp: stage: build script: - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data - mkdir -p build && cd build - - apt-get install --yes --no-install-recommends libclang-dev llvm-dev - - clang++ -fPIC -shared -o goostring-format-checker.so ../test/goostring-format-checker/goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-11/include/ - - CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker" -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include;-warnings-as-errors=*" .. + - apt-get install --yes --no-install-recommends libclang-12-dev llvm-12-dev libc++-12-dev libc++abi-12-dev clang-tidy-12 clang-12 + - clang++-12 -fPIC -shared -o goostring-format-checker.so ../test/goostring-format-checker/goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-12/include/ + - CC=clang-12 CXX=clang++-12 cmake -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker" -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy-12;-header-filter=.;-checks=-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr;-warnings-as-errors=*" .. - ninja - ctest --output-on-failure @@ -85,9 +85,9 @@ build_mingw64_fedora: build_clazy: stage: build script: - - apt-get install --yes --no-install-recommends clazy + - apt-get install --yes --no-install-recommends clazy clang-12 - mkdir -p build && cd build - - CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja .. + - CC=clang-12 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja .. - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja build_android: diff --git a/README.contributors b/README.contributors index e77d05e7..308a06c6 100644 --- a/README.contributors +++ b/README.contributors @@ -29,7 +29,7 @@ To get the clang-format warnings locally instead at CI time we recommend you to copy the hooks/pre-commit to your .git cp hooks/pre-commit .git/hooks/ -We are using clang-format 11 on CI. Unfortunately clang-format is not totally +We are using clang-format 12 on CI. Unfortunately clang-format is not totally compatible with older versions of itself. If CI gives you trouble but your local clang-format disagrees, just apply the changes suggested by CI and then commit with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer |