Skip to content
Snippets Groups Projects
Verified Commit 449851ff authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

CI: update clang tools for lint:*

In particular, in .gitlab-ci.yml I see no reason to hard-code
the version of clang tools - it seems easier to control that
only when generating the image.
parent 2385eddf
No related branches found
No related tags found
1 merge request!701CI clang tools: 5.0 -> 7.0
Pipeline #42281 failed
......@@ -43,10 +43,10 @@ build:clang:linux:amd64:
image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7 # newer Debian for newer Clang
script:
- rm daemon/lua/kres-gen.lua
- CXX=clang++-5.0 CC=clang-5.0 make -k all "CFLAGS=-Werror -Wno-error=unused-command-line-argument -ggdb"
- CXX=clang++ CC=clang make -k all "CFLAGS=-Werror -Wno-error=unused-command-line-argument -ggdb"
- STATUS="$(git status --untracked-files=normal --porcelain)"
- test -n "${STATUS}" && echo "${STATUS}" && echo "Build + install made working tree dirty, did you forget to update something?" && exit 2
- CXX=clang++-5.0 CC=clang-5.0 make install "CFLAGS=-Werror -ggdb"
- CXX=clang++ CC=clang make install "CFLAGS=-Werror -ggdb"
tags:
- docker
- linux
......@@ -87,7 +87,7 @@ lint:c:
image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7 # newer Debian for newer Clang
dependencies: [] # do not download build artifacts
script:
- make lint-c CLANG_TIDY="clang-tidy-5.0 -quiet"
- make lint-c CLANG_TIDY="clang-tidy -quiet"
tags:
- docker
......@@ -99,7 +99,7 @@ lint:clang-scan-build:
image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7 # newer Debian for newer Clang
dependencies: [] # do not download build artifacts
script:
- MAKEFLAGS="-k -j$(nproc)" SCAN_BUILD="/usr/lib/llvm-5.0/bin/scan-build -o scan-results --status-bugs -no-failure-reports" ./tests/clang_scan_build.sh make
- MAKEFLAGS="-k -j$(nproc)" SCAN_BUILD="scan-build -o scan-results --status-bugs -no-failure-reports" ./tests/clang_scan_build.sh make
artifacts:
when: on_failure
expire_in: '1 day'
......
......@@ -39,5 +39,5 @@ RUN luarocks install luacov
# LuaJIT binary for stand-alone scripting
RUN apt-get install -y -qqq luajit
# clang for kresd CI
RUN apt-get install -y -qqq clang-5.0 clang-tools-5.0 clang-tidy-5.0
# clang for kresd CI, version updated as debian updates it
RUN apt-get install -y -qqq clang clang-tools clang-tidy
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment