Merge branch 'open_source' into 'open_source'

Always rebuild gcc and clang.

See merge request irmb/VirtualFluids_dev!31

.gitlab-ci.yml

@@ -23,7 +23,7 @@ stages:
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
-      - $BUILD_FOLDER
+      - $CI_PROJECT_DIR/cache
 
   artifacts:
     expire_in: 1 hrs
@@ -33,6 +33,9 @@ stages:
   before_script:
     - export CC=gcc
     - export CXX=g++
+    - export CCACHE_BASEDIR=$CI_PROJECT_DIR
+    - export CCACHE_DIR=$CI_PROJECT_DIR/cache
+    - ccache -s
 
   script:
     - $CXX --version
@@ -41,8 +44,9 @@ stages:
     - mpirun --version
     - mkdir -p $CI_PROJECT_DIR/$BUILD_FOLDER
     - cd $CI_PROJECT_DIR/$BUILD_FOLDER
+    - rm -r -f ./*
     - cmake ..
-      --preset=all_make
+      --preset=all_make_ccache
       -DBUILD_WARNINGS_AS_ERRORS=ON
       -DCMAKE_CUDA_ARCHITECTURES=60
     - cmake . -LAH
@@ -64,42 +68,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  2>&1 | tee gcc_warnings.txt
-    - ccache -s
-
-  artifacts:
-    paths:
-      - build/gcc_warnings.txt
-
-  cache:
-    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    paths:
-      - $CI_PROJECT_DIR/cache
-
 ###############################################################################
 msvc_16:
   stage: build
@@ -214,8 +182,7 @@ clang_build_analyzer_clang_10:
     - mkdir -p $CI_PROJECT_DIR/build
     - cd $CI_PROJECT_DIR/build
     - cmake ..
-      -DBUILD_VF_CPU=ON
-      -DBUILD_VF_GPU=ON
+      --preset=all_make
       -DCMAKE_CUDA_ARCHITECTURES=60
       -DCMAKE_CXX_FLAGS=-ftime-trace
     - ClangBuildAnalyzer --start .
@@ -249,8 +216,7 @@ include_what_you_use_clang_10:
     - mkdir -p $CI_PROJECT_DIR/build
     - cd $CI_PROJECT_DIR/build
     - cmake ..
-      -DBUILD_VF_CPU=ON
-      -DBUILD_VF_GPU=ON
+      --preset=all_make
       -DCMAKE_CUDA_ARCHITECTURES=60
       -DBUILD_VF_INCLUDE_WHAT_YOU_USE=ON
     - make
@@ -284,7 +250,7 @@ cppcheck:
 
 ###############################################################################
 # lizard - Cyclomatic Complexity Analyzer
-# Ignore warnings is manually set to 191. This job will fail when new warnings are added.
+# Ignore warnings is manually set to 400, as we do not want this job to fail.
 lizard:
   stage: analyze
 
@@ -373,9 +339,8 @@ clang-tidy:
     - mkdir -p $CI_PROJECT_DIR/build
     - cd $CI_PROJECT_DIR/build
     - cmake ..
+      --preset=cpu_make
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-      -DBUILD_VF_CPU=ON
-      -DBUILD_VF_GPU=OFF
     - python3 ../utilities/filterCompileCommands.py compile_commands.json
     - run-clang-tidy -quiet > clangtidy.txt
 
@@ -402,7 +367,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

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