Commit 21871013 authored by Lukas Riedel's avatar Lukas Riedel

Change use of 'multicore' CI runner

* build:main now uses default runner
* test:parallel now uses multicore runner
parent e3647392
...@@ -84,14 +84,10 @@ prep:update-dune-clang: ...@@ -84,14 +84,10 @@ prep:update-dune-clang:
# --- Build jobs --- # --- Build jobs ---
build:main: build:main:
stage: build stage: build
tags:
- multicore
script: script:
- CMAKE_FLAGS="$CMAKE_FLAGS" - CMAKE_FLAGS="$CMAKE_FLAGS"
MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie all $DUNECONTROL --only=dorie all
- MAKE_FLAGS="$MAKE_FLAGS" - $DUNECONTROL --only=dorie make build_tests
$DUNECONTROL --only=dorie make build_tests
artifacts: artifacts:
name: "$CI_JOB_NAME" name: "$CI_JOB_NAME"
paths: paths:
...@@ -107,8 +103,7 @@ build:debug: &debug ...@@ -107,8 +103,7 @@ build:debug: &debug
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'" -DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
$DUNECONTROL --only=dorie configure $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: build:debug-clang:
<<: *debug <<: *debug
...@@ -121,8 +116,7 @@ build:debug-clang: ...@@ -121,8 +116,7 @@ build:debug-clang:
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'" -DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
$DUNECONTROL --only=dorie configure $DUNECONTROL --only=dorie configure
- MAKE_FLAGS="$MAKE_FLAGS" - $DUNECONTROL --only=dorie make dorie_mass_conservation
$DUNECONTROL --only=dorie make dorie_mass_conservation
# --- Tests --- # --- Tests ---
...@@ -147,6 +141,8 @@ test:ode: ...@@ -147,6 +141,8 @@ test:ode:
test:parallel: test:parallel:
<<: *test <<: *test
tags:
- multicore
script: script:
- $DUNECONTROL --only=dorie configure - $DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make test_run_parallel - $DUNECONTROL --only=dorie make test_run_parallel
......
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