Commit c5a40253 authored by Lukas Riedel's avatar Lukas Riedel

Merge branch 'change-multicore-runner-usage' into 'master'

Change multicore runner usage

See merge request !59
parents e3647392 d0aba6d7
......@@ -10,8 +10,6 @@ variables:
CMAKE_FLAGS:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
MAKE_FLAGS:
-j $CPUS_MULTICORE
image: $DUNE_ENV_IMAGE
......@@ -84,14 +82,10 @@ prep:update-dune-clang:
# --- Build jobs ---
build:main:
stage: build
tags:
- multicore
script:
- CMAKE_FLAGS="$CMAKE_FLAGS"
MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie all
- MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie make build_tests
- $DUNECONTROL --only=dorie make build_tests
artifacts:
name: "$CI_JOB_NAME"
paths:
......@@ -107,8 +101,7 @@ build:debug: &debug
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
$DUNECONTROL --only=dorie configure
- MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie make dorie_mass_conservation
- $DUNECONTROL --only=dorie make dorie_mass_conservation
build:debug-clang:
<<: *debug
......@@ -121,8 +114,7 @@ build:debug-clang:
-DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
$DUNECONTROL --only=dorie configure
- MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie make dorie_mass_conservation
- $DUNECONTROL --only=dorie make dorie_mass_conservation
# --- Tests ---
......@@ -147,6 +139,8 @@ test:ode:
test:parallel:
<<: *test
tags:
- multicore
script:
- $DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make test_run_parallel
......
......@@ -13,6 +13,8 @@
* Raise software requirements to versions available on Ubuntu 18.04 LTS
(Bionic Beaver)
* Switch VTK output from conforming to non-conforming
* Use `multicore` build tag only for `test:parallel` build because the current
GitLab Runner cannot handle the load
### Fixed
* The source code is now compatible to the Clang LLVM compiler.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment