Unverified Commit 3f0fec5c authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #61 from nim65s/devel

 Packaging for the v1.3.1 Release
parents 3eebce33 1166d6a7
Pipeline #3359 passed with stage
in 39 minutes and 51 seconds
variables: include: http://rainboard.laas.fr/project/sot-torque-control/.gitlab-ci.yml
GIT_SUBMODULE_STRATEGY: "recursive"
GIT_DEPTH: "3"
CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
cache:
paths:
- ccache
.robotpkg-py-sot-torque-control: &robotpkg-py-sot-torque-control
except:
- gh-pages
script:
- mkdir -p ccache
- cd /root/robotpkg/wip/py-sot-torque-control
- git pull
- make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
- make install
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
- make test
robotpkg-py-sot-torque-control-14.04-release:
<<: *robotpkg-py-sot-torque-control
image: eur0c.laas.fr:5000/stack-of-tasks/sot-torque-control/py-sot-torque-control:14.04
robotpkg-py-sot-torque-control-16.04-release:
<<: *robotpkg-py-sot-torque-control
image: eur0c.laas.fr:5000/stack-of-tasks/sot-torque-control/py-sot-torque-control:16.04
.robotpkg-sot-torque-control: &robotpkg-sot-torque-control
except:
- gh-pages
script:
- mkdir -p ccache
- cd /root/robotpkg/wip/sot-torque-control
- git pull
- make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
- make install
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
- make test
robotpkg-sot-torque-control-14.04-release:
<<: *robotpkg-sot-torque-control
image: eur0c.laas.fr:5000/stack-of-tasks/sot-torque-control/sot-torque-control:14.04
robotpkg-sot-torque-control-16.04-release:
<<: *robotpkg-sot-torque-control
image: eur0c.laas.fr:5000/stack-of-tasks/sot-torque-control/sot-torque-control:16.04
doc-coverage:
<<: *robotpkg-py-sot-torque-control
image: eur0c.laas.fr:5000/stack-of-tasks/sot-torque-control/py-sot-torque-control:16.04
before_script:
- echo -e 'CXXFLAGS+= --coverage\nLDFLAGS+= --coverage\nPKG_DEFAULT_OPTIONS= debug' >> /opt/openrobots/etc/robotpkg.conf
after_script:
- cd /root/robotpkg/wip/py-sot-torque-control
- cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
- make doc
- mv doc/doxygen-html ${CI_PROJECT_DIR}
- mkdir -p ${CI_PROJECT_DIR}/coverage/
- gcovr -r .
- gcovr -r . --html --html-details -o ${CI_PROJECT_DIR}/coverage/index.html
artifacts:
expire_in: 1 day
paths:
- doxygen-html/
- coverage/
Subproject commit 083fa2cb0fa4ad594926d9bb3d246075e62ce9ee Subproject commit dc8b946d456d2c41ad12b819111b005148c68031
...@@ -21,15 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ...@@ -21,15 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE(cmake/base.cmake) INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake) INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/lapack.cmake)
INCLUDE(cmake/cpack.cmake)
INCLUDE(cmake/eigen.cmake) INCLUDE(cmake/eigen.cmake)
INCLUDE(cmake/python.cmake) INCLUDE(cmake/python.cmake)
INCLUDE(cmake/test.cmake) INCLUDE(cmake/test.cmake)
SET(PROJECT_NAMESPACE stack-of-tasks)
SET(PROJECT_NAME sot-torque-control) SET(PROJECT_NAME sot-torque-control)
SET(PROJECT_DESCRIPTION "Collection of dynamic-graph entities aimed at implementing torque control on different robots.") SET(PROJECT_DESCRIPTION "Collection of dynamic-graph entities aimed at implementing torque control on different robots.")
SET(PROJECT_URL "https://github.com/stack-of-tasks/sot-torque-control") SET(PROJECT_URL "https://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}")
SET(CUSTOM_HEADER_DIR "sot/torque-control") SET(CUSTOM_HEADER_DIR "sot/torque-control")
...@@ -221,4 +220,3 @@ ENDIF(BUILD_PYTHON_INTERFACE) ...@@ -221,4 +220,3 @@ ENDIF(BUILD_PYTHON_INTERFACE)
SETUP_PROJECT_FINALIZE() SETUP_PROJECT_FINALIZE()
SETUP_PROJECT_CPACK()
Subproject commit 99aafa43694125e67046bdc91c7b6485b5b6ca45 Subproject commit 1d9aeca25e970d2d967fd5be0fb93fe961db121b
...@@ -5,6 +5,7 @@ IF(BUILD_PYTHON_INTERFACE) ...@@ -5,6 +5,7 @@ IF(BUILD_PYTHON_INTERFACE)
unit_test_control_manager.py unit_test_control_manager.py
unit_test_free_flyer_locator.py unit_test_free_flyer_locator.py
unit_test_position_controller.py unit_test_position_controller.py
unit_test_se3_trajectory_generator.py
) )
foreach(localtest ${LIST_OF_TESTS}) foreach(localtest ${LIST_OF_TESTS})
......
Supports Markdown
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