Skip to content

Commit 3d1b17b

Browse files
author
Guilhem Saurel
authored
Merge pull request #2 from nim65s/master
[CI] add .gitlab-ci.yml, but fix tests first, but clean cmake first.
2 parents 3101ed4 + 05d40b0 commit 3d1b17b

21 files changed

+143
-174
lines changed

.gitlab-ci.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
variables:
2+
GIT_SUBMODULE_STRATEGY: "recursive"
3+
GIT_DEPTH: "3"
4+
CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
5+
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
6+
7+
cache:
8+
paths:
9+
- ccache
10+
11+
.robotpkg-py-dynamic-graph-tutorial: &robotpkg-py-dynamic-graph-tutorial
12+
except:
13+
- gh-pages
14+
script:
15+
- mkdir -p ccache
16+
- cd /root/robotpkg/wip/py-dynamic-graph-tutorial
17+
- git pull
18+
- make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
19+
- make install
20+
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
21+
- make test
22+
23+
robotpkg-py-dynamic-graph-tutorial-14.04-release:
24+
<<: *robotpkg-py-dynamic-graph-tutorial
25+
image: eur0c.laas.fr:5000/stack-of-tasks/dynamic-graph-tutorial/py-dynamic-graph-tutorial:14.04
26+
27+
robotpkg-py-dynamic-graph-tutorial-16.04-release:
28+
<<: *robotpkg-py-dynamic-graph-tutorial
29+
image: eur0c.laas.fr:5000/stack-of-tasks/dynamic-graph-tutorial/py-dynamic-graph-tutorial:16.04
30+
31+
robotpkg-py-dynamic-graph-tutorial-18.04-release:
32+
<<: *robotpkg-py-dynamic-graph-tutorial
33+
image: eur0c.laas.fr:5000/stack-of-tasks/dynamic-graph-tutorial/py-dynamic-graph-tutorial:18.04
34+
35+
doc-coverage:
36+
<<: *robotpkg-py-dynamic-graph-tutorial
37+
image: eur0c.laas.fr:5000/stack-of-tasks/dynamic-graph-tutorial/py-dynamic-graph-tutorial:16.04
38+
before_script:
39+
- echo -e 'CXXFLAGS+= --coverage\nLDFLAGS+= --coverage\nPKG_DEFAULT_OPTIONS= debug' >> /opt/openrobots/etc/robotpkg.conf
40+
after_script:
41+
- cd /root/robotpkg/wip/py-dynamic-graph-tutorial
42+
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
43+
- make doc
44+
- mv doc/doxygen-html ${CI_PROJECT_DIR}
45+
- mkdir -p ${CI_PROJECT_DIR}/coverage/
46+
- gcovr -r .
47+
- gcovr -r . --html --html-details -o ${CI_PROJECT_DIR}/coverage/index.html
48+
artifacts:
49+
expire_in: 1 day
50+
paths:
51+
- doxygen-html/
52+
- coverage/
53+

AUTHORS

Lines changed: 0 additions & 1 deletion
This file was deleted.

CMakeLists.txt

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
11
#
2-
# Copyright 2010 CNRS
2+
# Copyright 2010, 2018 CNRS
33
# Author: Florent Lamiraux
44
#
55

6-
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
6+
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
77

8-
SET (CXX_DISABLE_WERROR ON)
98
INCLUDE(cmake/base.cmake)
109
INCLUDE(cmake/boost.cmake)
11-
INCLUDE(cmake/lapack.cmake)
12-
INCLUDE(cmake/cpack.cmake)
10+
INCLUDE(cmake/test.cmake)
11+
INCLUDE(cmake/python.cmake)
1312

1413
SET(PROJECT_NAME dynamic-graph-tutorial)
15-
project(${PROJECT_NAME})
16-
1714
SET(PROJECT_DESCRIPTION "Tutorial for dynamic-graph")
18-
SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph-tutorial")
1915

20-
SET(${PROJECT_NAME}_HEADERS
21-
include/dynamic-graph/tutorial/inverted-pendulum.hh
22-
include/dynamic-graph/tutorial/feedback-controller.hh
23-
)
24-
#
25-
# Look for dependencies
26-
#
16+
SET(PROJECT_URL "http://github.com/stack-of-tasks/${PROJECT_NAME}")
2717

2818
SETUP_PROJECT()
2919

30-
#
31-
# Documentation dependency to package dynamic-graph
32-
#
33-
3420
ADD_REQUIRED_DEPENDENCY("dynamic-graph")
3521

36-
#
37-
# Dependency to package dynamic-graph-python
38-
#
39-
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
22+
SET(BOOST_COMPONENTS unit_test_framework)
23+
24+
OPTION (BUILD_PYTHON_INTERFACE "Build the python binding" ON)
25+
IF(BUILD_PYTHON_INTERFACE)
26+
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
27+
FINDPYTHON()
28+
STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
29+
SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} python)
30+
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
31+
ENDIF(BUILD_PYTHON_INTERFACE)
32+
33+
SEARCH_FOR_BOOST()
34+
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
4035

36+
ADD_SUBDIRECTORY(include/dynamic-graph/tutorial)
4137
ADD_SUBDIRECTORY(src)
4238
ADD_SUBDIRECTORY(doc)
39+
ADD_SUBDIRECTORY(tests)
4340

4441
SETUP_PROJECT_FINALIZE()

COPYING

Lines changed: 0 additions & 15 deletions
This file was deleted.

ChangeLog

Lines changed: 0 additions & 1 deletion
This file was deleted.

INSTALL

Lines changed: 0 additions & 21 deletions
This file was deleted.

NEWS

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
[![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-2-Clause)
21
# dynamic-graph-tutorial
32

3+
[![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-2-Clause)
4+
[![Building Status](https://travis-ci.org/stack-of-tasks/dynamic-graph-tutorial.svg?branch=master)](https://travis-ci.org/stack-of-tasks/dynamic-graph-tutorial)
5+
[![Pipeline status](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-tutorial/badges/master/pipeline.svg)](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-tutorial/commits/master)
6+
[![Coverage report](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-tutorial/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/dynamic-graph-tutorial/master/coverage/)
7+
8+
49
See INSTALL for installation instruction.
510

611
The documentation is available here:
7-
[http://stack-of-tasks.github.io/dynamic-graph-tutorial/](http://stack-of-tasks.github.io/dynamic-graph-tutorial/)
12+
[http://stack-of-tasks.github.io/dynamic-graph-tutorial/](http://stack-of-tasks.github.io/dynamic-graph-tutorial/)

autogen.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

dg-tutorial.pc.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)