thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52775 from ClickHouse/remove-coverity-2

Browse Source 
Remove Coverity (part 2)
This commit is contained in:
Alexey Milovidov 2023-07-30 12:49:04 +03:00 committed by GitHub
commit 8155659f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/packager/binary/build.sh
View File

@ -80,19 +80,9 @@ else
cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" .. cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
fi fi
if [ "coverity" == "$COMBINED_OUTPUT" ]
then
mkdir -p /workdir/cov-analysis
wget --post-data "token=$COVERITY_TOKEN&project=ClickHouse%2FClickHouse" -qO- https://scan.coverity.com/download/linux64 | tar xz -C /workdir/cov-analysis --strip-components 1
export PATH=$PATH:/workdir/cov-analysis/bin
cov-configure --config ./coverity.config --template --comptype clangcc --compiler "$CC"
SCAN_WRAPPER="cov-build --config ./coverity.config --dir cov-int"
fi
# No quotes because I want it to expand to nothing if empty. # No quotes because I want it to expand to nothing if empty.
# shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty. # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
$SCAN_WRAPPER ninja $NINJA_FLAGS $BUILD_TARGET ninja $NINJA_FLAGS $BUILD_TARGET
ls -la ./programs ls -la ./programs
@ -175,13 +165,6 @@ then
mv "$COMBINED_OUTPUT.tar.zst" /output mv "$COMBINED_OUTPUT.tar.zst" /output
fi fi
if [ "coverity" == "$COMBINED_OUTPUT" ]
then
# Coverity does not understand ZSTD.
tar -cvz -f "coverity-scan.tar.gz" cov-int
mv "coverity-scan.tar.gz" /output
fi
ccache_status ccache_status
ccache --evict-older-than 1d ccache --evict-older-than 1d

7
docker/packager/packager
View File

@ -253,11 +253,6 @@ def parse_env_variables(
cmake_flags.append(f"-DCMAKE_C_COMPILER={cc}") cmake_flags.append(f"-DCMAKE_C_COMPILER={cc}")
cmake_flags.append(f"-DCMAKE_CXX_COMPILER={cxx}") cmake_flags.append(f"-DCMAKE_CXX_COMPILER={cxx}")
# Create combined output archive for performance tests.
if package_type == "coverity":
result.append("COMBINED_OUTPUT=coverity")
result.append('COVERITY_TOKEN="$COVERITY_TOKEN"')
if sanitizer: if sanitizer:
result.append(f"SANITIZER={sanitizer}") result.append(f"SANITIZER={sanitizer}")
if build_type: if build_type:
@ -356,7 +351,7 @@ def parse_args() -> argparse.Namespace:
) )
parser.add_argument( parser.add_argument(
"--package-type", "--package-type",
choices=["deb", "binary", "coverity"], choices=["deb", "binary"],
required=True, required=True,
) )
parser.add_argument( parser.add_argument(

11
tests/ci/ci_config.py
View File

@ -19,16 +19,6 @@ CI_CONFIG = {
"with_coverage": False, "with_coverage": False,
"comment": "", "comment": "",
}, },
"coverity": {
"compiler": "clang-16",
"build_type": "",
"sanitizer": "",
"package_type": "coverity",
"tidy": "disable",
"with_coverage": False,
"official": False,
"comment": "A special build for coverity",
},
"package_aarch64": { "package_aarch64": {
"compiler": "clang-16-aarch64", "compiler": "clang-16-aarch64",
"build_type": "", "build_type": "",
@ -187,7 +177,6 @@ CI_CONFIG = {
"builds_report_config": { "builds_report_config": {
"ClickHouse build check": [ "ClickHouse build check": [
"package_release", "package_release",
"coverity",
"package_aarch64", "package_aarch64",
"package_asan", "package_asan",
"package_ubsan", "package_ubsan",