Commit c7a2e806 authored by Lukas Riedel's avatar Lukas Riedel

Rename mass-conservation target. Add 'build_tests' to build jobs

Also add path to dunecontrol as variable in gitlab-ci.yml
parent 3a200919
...@@ -2,6 +2,7 @@ image: dorie/dune-env:2.5.1 ...@@ -2,6 +2,7 @@ image: dorie/dune-env:2.5.1
variables: variables:
DUNE_CONTROL_PATH: /opt/dune:$CI_PROJECT_DIR DUNE_CONTROL_PATH: /opt/dune:$CI_PROJECT_DIR
DUNECONTROL: ./dune-common/bin/dunecontrol
before_script: before_script:
- cd /opt/dune - cd /opt/dune
...@@ -16,7 +17,8 @@ build:main: ...@@ -16,7 +17,8 @@ build:main:
tags: tags:
- demeter - demeter
script: script:
- CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --only=dorie all - CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" $DUNECONTROL --only=dorie all
- $DUNECONTROL --only=dorie make build_tests
artifacts: artifacts:
name: "$CI_JOB_NAME" name: "$CI_JOB_NAME"
paths: paths:
...@@ -30,9 +32,10 @@ build:update_dune: ...@@ -30,9 +32,10 @@ build:update_dune:
only: only:
- master - master
script: script:
- ./dune-common/bin/dunecontrol update - $DUNECONTROL update
- ./dune-common/bin/dunecontrol exec "rm -rf build-cmake" - $DUNECONTROL exec "rm -rf build-cmake"
- CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --module=dorie all - CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" $DUNECONTROL --module=dorie all
- $DUNECONTROL --only=dorie make build_tests
artifacts: artifacts:
name: "$CI_JOB_NAME" name: "$CI_JOB_NAME"
paths: paths:
...@@ -44,7 +47,8 @@ build:debug: ...@@ -44,7 +47,8 @@ build:debug:
tags: tags:
- demeter - demeter
script: script:
- CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --only=dorie all - CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" $DUNECONTROL --only=dorie all
- $DUNECONTROL --only=dorie make build_tests
test:main: test:main:
stage: test stage: test
...@@ -54,8 +58,8 @@ test:main: ...@@ -54,8 +58,8 @@ test:main:
- build:main - build:main
allow_failure: true allow_failure: true
script: script:
- ./dune-common/bin/dunecontrol --only=dorie configure - $DUNECONTROL --only=dorie configure
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test - ARGS="--output-on-failure -j 2" $DUNECONTROL --only=dorie make test
artifacts: artifacts:
name: "$CI_JOB_NAME" name: "$CI_JOB_NAME"
paths: paths:
...@@ -72,8 +76,8 @@ test:update_dune: ...@@ -72,8 +76,8 @@ test:update_dune:
- master - master
allow_failure: true allow_failure: true
script: script:
- ./dune-common/bin/dunecontrol --only=dorie configure - $DUNECONTROL --only=dorie configure
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test - ARGS="--output-on-failure -j 2" $DUNECONTROL --only=dorie make test
artifacts: artifacts:
name: "$CI_JOB_NAME" name: "$CI_JOB_NAME"
paths: paths:
...@@ -87,8 +91,8 @@ deploy:build_docs: ...@@ -87,8 +91,8 @@ deploy:build_docs:
dependencies: dependencies:
- build:main - build:main
script: script:
- ./dune-common/bin/dunecontrol --only=dorie configure - $DUNECONTROL --only=dorie configure
- ./dune-common/bin/dunecontrol --only=dorie make doc - $DUNECONTROL --only=dorie make doc
artifacts: artifacts:
name: "$CI_JOB_NAME" name: "$CI_JOB_NAME"
paths: paths:
......
...@@ -40,9 +40,9 @@ configure_file(mass_conservation.mini.in ${CMAKE_CURRENT_SOURCE_DIR}/mass_conser ...@@ -40,9 +40,9 @@ configure_file(mass_conservation.mini.in ${CMAKE_CURRENT_SOURCE_DIR}/mass_conser
dune_add_system_test( dune_add_system_test(
SOURCE test-mass-conservation.cc SOURCE test-mass-conservation.cc
BASENAME mass-conservation BASENAME mass-conservation
CREATED_TARGETS target CREATED_TARGETS test-mass-conservation
INIFILE mass_conservation.mini) INIFILE mass_conservation.mini)
dune_target_link_libraries(${target} ${DUNE_LIBS}) dune_target_link_libraries(${test-mass-conservation} ${DUNE_LIBS})
# dorie pfg # dorie pfg
dorie_add_system_test(dorie-rfg parfield.mini) dorie_add_system_test(dorie-rfg parfield.mini)
......
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