diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52e3b9b9dd3b1aa2c238bf8566aa7634bbf94a4d..b3c065c4c44e67d6f7d52100a772b906010b9b77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,27 +34,26 @@ stages: paths: - $BUILD_FOLDER - before_script: - - export CC=gcc - - export CXX=g++ + script: - export CCACHE_BASEDIR=$CI_PROJECT_DIR - export CCACHE_DIR=$CI_PROJECT_DIR/cache - - ccache -s - - - script: + - export CCACHE_COMPILERCHECK=content + - ccache --zero-stats + - ccache --show-stats - $CXX --version - $CC --version - cmake --version - mpirun --version - mkdir -p $CI_PROJECT_DIR/$BUILD_FOLDER - cd $CI_PROJECT_DIR/$BUILD_FOLDER + - rm -r -f ./* - cmake .. --preset=all_make_ccache -DBUILD_WARNINGS_AS_ERRORS=ON -DCMAKE_CUDA_ARCHITECTURES=60 - cmake . -LAH - make -j4 + - ccache --show-stats variables: BUILD_FOLDER: "build" @@ -63,8 +62,11 @@ stages: gcc_9: extends: .gnu_build_template -############################################################################### + before_script: + - export CC=gcc + - export CXX=g++ +############################################################################### clang_10: extends: .gnu_build_template @@ -72,38 +74,6 @@ clang_10: - export CC=clang - export CXX=clang++ - -############################################################################### -gcc_9_rebuild: - stage: build - - image: irmb/virtualfluids-deps-ubuntu20.04 - - tags: - - gpu - - linux - - before_script: - - export CCACHE_BASEDIR=$CI_PROJECT_DIR - - export CCACHE_DIR=$CI_PROJECT_DIR/cache - - ccache -s - - script: - - mkdir -p $CI_PROJECT_DIR/build - - cd $CI_PROJECT_DIR/build - - rm -r -f ./* - - cmake .. - --preset=all_make_ccache - -DBUILD_WARNINGS_AS_ERRORS=ON - -DCMAKE_CUDA_ARCHITECTURES=60 - - make -j4 - - ccache -s - - cache: - key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - paths: - - $CI_PROJECT_DIR/cache - ############################################################################### msvc_16: stage: build @@ -146,7 +116,6 @@ msvc_16: ############################################################################### ## Build Python ## ############################################################################### - gcc_9_python: stage: build_python @@ -168,7 +137,7 @@ gcc_9_python: - export CCACHE_DIR=$CI_PROJECT_DIR/cache script: - - python3 setup.py bdist_wheel + - python3 setup.py bdist_wheel build_ext --build-temp=build ############################################################################### ## Container Upload ## @@ -615,7 +584,7 @@ sonar-scanner: variables: SONAR_HOST_URL: "http://gitlab-runner01.irmb.bau.tu-bs.de/sonarqube/" - needs: ["cppcheck","clang-tidy","gcov_gcc_9","gcc_9_rebuild"] + needs: ["cppcheck","clang-tidy","gcov_gcc_9"] before_script: - cd /tmp diff --git a/setup.py b/setup.py index 11676929cf55ad17742d37a7679a4d3e91ebb436..c5de9128136df9c769f0450f01e64234784040f0 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,8 @@ vf_cmake_args = [ "-DUSE_METIS=ON", "-DUSE_MPI=ON", "-DBUILD_SHARED_LIBS=OFF", - "-DBUILD_VF_UNIT_TESTS:BOOL=ON" + "-DBUILD_VF_UNIT_TESTS:BOOL=ON", + "-DBUILD_WARNINGS_AS_ERRORS=OFF" ] diff --git a/sonar-project.properties b/sonar-project.properties index 7f31fa97101d3002aa47096831206cf9768a85b5..a25bb1af8070f0ea5b75f67e624211f38fef38bf 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -27,8 +27,6 @@ sonar.cxx.clangtidy.reportPath=build/clangtidy.txt sonar.cxx.jsonCompilationDatabase=build/compile_commands.json -sonar.cxx.gcc.reportPath=build/gcc_warnings.txt - #sonar.cxx.valgrind.reportPath sonar.cxx.funccomplexity.threshold=10