Merge remote-tracking branch 'origin/master' into adrien

.gitlab-ci.yml

+# gitlab-ci file for waves
+
+default:
+    image: rboman/waves
+
+stages:
+    - build
+    - test
+
+full_build:
+    stage: build
+    script:
+        - source /opt/intel/mkl/bin/mklvars.sh intel64
+        - source /opt/intel/tbb/bin/tbbvars.sh intel64
+        - printenv | sort
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -Wno-dev ..
+        - make -j 4
+    artifacts:
+        paths:
+            - build/
+        expire_in: 1 hour
+
+build_no_tlnos:
+    stage: build
+    script:
+        - source /opt/intel/mkl/bin/mklvars.sh intel64
+        - source /opt/intel/tbb/bin/tbbvars.sh intel64
+        - printenv | sort
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake ..
+        - make -j 4
+            
+doxygen:
+    stage: test
+    script:
+        - cd build
+        - make dox
+    artifacts:
+        paths:
+            - build/doxygen/
+        expire_in: 1 day
+                  
+ctest:
+    stage: test
+    script:
+        - source /opt/intel/mkl/bin/mklvars.sh intel64
+        - source /opt/intel/tbb/bin/tbbvars.sh intel64
+        - cd build
+        - ctest -j 4 #--verbose
+    #timeout: 10 hours  # will be available in 12.3
+
+
+
+