From c0bd7266ad6f08e7b8af5f96718a55f3d62175c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 4 Jun 2022 12:46:27 +0100 Subject: [PATCH] Gitlab-CI: Add tfshark to code check job Building tfshark is disabled by default in CMake options. The tfshark code should be continuously tested or removed from the main repo. It should not be allowed to exist in a broken state. Add it to the code check job to make sure that it at least compiles. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eed579804e..9da610c1e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -527,8 +527,8 @@ Code Checks + Clang Warnings: - ./tools/check_tfs.py --commits $NUM_COMMITS | tee tfs_check.txt - cd build - printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)" - # We don't have an "All options" job, so build fuzzshark here. - - cmake -DENABLE_EXTRA_COMPILER_WARNINGS=on -DENABLE_CHECKHF_CONFLICT=on -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DBUILD_fuzzshark=ON -DBUILD_logwolf=ON -DENABLE_CCACHE=ON -G Ninja .. + # We don't have an "All options" job, so build fuzzshark and tfshark here. + - cmake -DENABLE_EXTRA_COMPILER_WARNINGS=on -DENABLE_CHECKHF_CONFLICT=on -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DBUILD_fuzzshark=ON -DBUILD_tfshark=On -DBUILD_logwolf=ON -DENABLE_CCACHE=ON -G Ninja .. - printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)" - mkdir ../html - script --command ninja --flush --quiet --return ../tmp_clang_report.txt