Merge branch 'master' into feature/parallel_grid

.gitlab-ci.yml

@@ -23,20 +23,20 @@ variables:
     name: "$CI_BUILD_NAME"
     expire_in: 6 h
   script:
-  - dunecontrol --opts=gitlab-ci.$COMPILER.opts --current all
+  - dunecontrol --opts=gitlab-ci.$COMPILER.opts --make-opts="-j${DUNECI_PARALLEL:-1}" --current all
   - cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE $BUILD_DIRECTORY
 
 # test
 .test_template: &test-definition
   stage: test
   script:
-  - cmake --build $BUILD_DIRECTORY --target check
+  - cmake --build $BUILD_DIRECTORY --target check -- -j${DUNECI_PARALLEL:-1}
 
 # demo
 .demo_template: &demo-definition
   stage: demo
   script:
-  - cmake --build $BUILD_DIRECTORY --target examples
+  - cmake --build $BUILD_DIRECTORY --target examples -- -j${DUNECI_PARALLEL:-1}
 
 # ------------------------------------------------------------------------------
 # setup