Commit 8d9b6011 authored by Lukas Riedel's avatar Lukas Riedel

Merge branch 'test-new-ci-tags' into 'master'

Use new CI tags

See merge request !48
parents e6edf8e2 a6b07def
......@@ -7,7 +7,7 @@ variables:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
MAKE_FLAGS:
-j 2
-j 4
before_script:
- cd /opt/dune
......@@ -18,6 +18,8 @@ stages:
build:main:
stage: build
tags:
- multicore
script:
- CMAKE_FLAGS="$CMAKE_FLAGS"
MAKE_FLAGS="$MAKE_FLAGS"
......@@ -32,6 +34,8 @@ build:main:
build:update_dune:
stage: build
tags:
- multicore
only:
- master
script:
......@@ -51,6 +55,8 @@ build:update_dune:
build:debug:
stage: build
allow_failure: true
tags:
- multicore
script:
- CMAKE_FLAGS="
$CMAKE_FLAGS
......@@ -106,6 +112,8 @@ test:parallel:
stage: test
dependencies:
- build:main
tags:
- multicore
script:
- $DUNECONTROL --only=dorie configure
- $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