Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dorie
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
28
Issues
28
List
Boards
Labels
Milestones
Merge Requests
13
Merge Requests
13
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
dorie
dorie
Commits
c7a2e806
Commit
c7a2e806
authored
Mar 12, 2018
by
Lukas Riedel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename mass-conservation target. Add 'build_tests' to build jobs
Also add path to dunecontrol as variable in gitlab-ci.yml
parent
3a200919
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
.gitlab-ci.yml
.gitlab-ci.yml
+15
-11
testing/CMakeLists.txt
testing/CMakeLists.txt
+2
-2
No files found.
.gitlab-ci.yml
View file @
c7a2e806
...
...
@@ -2,6 +2,7 @@ image: dorie/dune-env:2.5.1
variables
:
DUNE_CONTROL_PATH
:
/opt/dune:$CI_PROJECT_DIR
DUNECONTROL
:
./dune-common/bin/dunecontrol
before_script
:
-
cd /opt/dune
...
...
@@ -16,7 +17,8 @@ build:main:
tags
:
-
demeter
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
:
name
:
"
$CI_JOB_NAME"
paths
:
...
...
@@ -30,9 +32,10 @@ build:update_dune:
only
:
-
master
script
:
-
./dune-common/bin/dunecontrol update
-
./dune-common/bin/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
-
$DUNECONTROL update
-
$DUNECONTROL exec "rm -rf build-cmake"
-
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
:
name
:
"
$CI_JOB_NAME"
paths
:
...
...
@@ -44,7 +47,8 @@ build:debug:
tags
:
-
demeter
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:
stage
:
test
...
...
@@ -54,8 +58,8 @@ test:main:
-
build:main
allow_failure
:
true
script
:
-
./dune-common/bin/dunecontrol
--only=dorie configure
-
ARGS="--output-on-failure -j 2"
./dune-common/bin/dunecontrol
--only=dorie make test
-
$DUNECONTROL
--only=dorie configure
-
ARGS="--output-on-failure -j 2"
$DUNECONTROL
--only=dorie make test
artifacts
:
name
:
"
$CI_JOB_NAME"
paths
:
...
...
@@ -72,8 +76,8 @@ test:update_dune:
-
master
allow_failure
:
true
script
:
-
./dune-common/bin/dunecontrol
--only=dorie configure
-
ARGS="--output-on-failure -j 2"
./dune-common/bin/dunecontrol
--only=dorie make test
-
$DUNECONTROL
--only=dorie configure
-
ARGS="--output-on-failure -j 2"
$DUNECONTROL
--only=dorie make test
artifacts
:
name
:
"
$CI_JOB_NAME"
paths
:
...
...
@@ -87,8 +91,8 @@ deploy:build_docs:
dependencies
:
-
build:main
script
:
-
./dune-common/bin/dunecontrol
--only=dorie configure
-
./dune-common/bin/dunecontrol
--only=dorie make doc
-
$DUNECONTROL
--only=dorie configure
-
$DUNECONTROL
--only=dorie make doc
artifacts
:
name
:
"
$CI_JOB_NAME"
paths
:
...
...
testing/CMakeLists.txt
View file @
c7a2e806
...
...
@@ -40,9 +40,9 @@ configure_file(mass_conservation.mini.in ${CMAKE_CURRENT_SOURCE_DIR}/mass_conser
dune_add_system_test
(
SOURCE test-mass-conservation.cc
BASENAME mass-conservation
CREATED_TARGETS t
arget
CREATED_TARGETS t
est-mass-conservation
INIFILE mass_conservation.mini
)
dune_target_link_libraries
(
${
t
arget
}
${
DUNE_LIBS
}
)
dune_target_link_libraries
(
${
t
est-mass-conservation
}
${
DUNE_LIBS
}
)
# dorie pfg
dorie_add_system_test
(
dorie-rfg parfield.mini
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment