From a0bfb6a7fbc6dd22833ef5de7349ac72a2638ea0 Mon Sep 17 00:00:00 2001
From: Francois Keith <keith@lirmm.fr>
Date: Fri, 20 Jun 2014 21:46:14 +0200
Subject: [PATCH] [Travis] Use travis submodule
Correct branch and email information.
---
.gitmodules | 3 +++
.travis | 1 +
.travis.yml | 49 +++++++++++++++++++++++--------------------------
.travis/build | 48 ------------------------------------------------
4 files changed, 27 insertions(+), 74 deletions(-)
create mode 160000 .travis
delete mode 100755 .travis/build
diff --git a/.gitmodules b/.gitmodules
index 60c9164..0cffde0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "cmake"]
path = cmake
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
+[submodule ".travis"]
+ path = .travis
+ url = git://github.com/jrl-umi3218/jrl-travis
diff --git a/.travis b/.travis
new file mode 160000
index 0000000..c6f1a3d
--- /dev/null
+++ b/.travis
@@ -0,0 +1 @@
+Subproject commit c6f1a3d39037be5dfc98d0d1d67db7dfe0141863
diff --git a/.travis.yml b/.travis.yml
index 8b61019..ad3844c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,26 @@
-env:
- global:
- secure: ECiHIh0aT5ml/MdKifvFIM2UpDWiPsJPEZpafLYM8U0VAPYThSfUe8JWhMsky8amOwm38akbSbr6C7iBKVpzjAqpgNdOdufO1RUZ6pUvtlVXiXTw2KlqPqbDVlD3QroVDhnX/rIRcg5ezEHAIb594uEaHdf8tlikhjdTc3aAgMA=
-branches:
- only:
- - master
-notifications:
- email:
- - hpp-source@laas.fr
-before_install:
-- git submodule update --init --recursive
-- sudo apt-get update -qq
-- sudo apt-get install -qq doxygen doxygen-latex libboost-all-dev libeigen3-dev liblapack-dev libblas-dev gfortran python-dev python-sphinx
-- sudo pip install cpp-coveralls --use-mirrors
-after_success:
-- coveralls -e _travis/install -e tests
-- git config --global user.name "Travis CI"
-- git config --global user.email "thomas.moulard+travis@gmail.com"
-- git remote set-url origin https://thomas-moulard:${GH_TOKEN}@github.com/stack-of-tasks/dynamic-graph-python.git
-- git fetch origin gh-pages:gh-pages
-- cd _travis/build/doc && ../../../cmake/github/update-doxygen-doc.sh
-script: ./.travis/build
language: cpp
-matrix:
+compiler:
+ - gcc
+ - clang
+env:
+ global:
+ - secure: ECiHIh0aT5ml/MdKifvFIM2UpDWiPsJPEZpafLYM8U0VAPYThSfUe8JWhMsky8amOwm38akbSbr6C7iBKVpzjAqpgNdOdufO1RUZ6pUvtlVXiXTw2KlqPqbDVlD3QroVDhnX/rIRcg5ezEHAIb594uEaHdf8tlikhjdTc3aAgMA=
+ - APT_DEPENDENCIES="doxygen doxygen-latex libboost-all-dev libeigen3-dev liblapack-dev libblas-dev gfortran python-dev python-sphinx"
+ - GIT_DEPENDENCIES="jrl-umi3218/jrl-mathtools jrl-umi3218/jrl-mal stack-of-tasks/dynamic-graph"
+ - LCOV_IGNORE_RULES="*unitTesting*"
allow_failures:
- compiler: clang
-compiler:
-- clang
-- gcc
+notifications:
+ email:
+ - hpp-source@laas.fr
+branches:
+ only:
+ - master
+ - debian
+script: ./.travis/run build
+after_success: ./.travis/run after_success
+after_failure: ./.travis/run after_failure
+before_install: ./.travis/run before_install
+matrix:
+ allow_failures:
+ - compiler: clang
diff --git a/.travis/build b/.travis/build
deleted file mode 100755
index b680199..0000000
--- a/.travis/build
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-set -ev
-
-# Directories.
-root_dir=`pwd`
-build_dir="$root_dir/_travis/build"
-install_dir="$root_dir/_travis/install"
-
-# Shortcuts.
-git_clone="git clone --quiet --recursive"
-
-# Create layout.
-rm -rf "$build_dir" "$install_dir"
-mkdir -p "$build_dir"
-mkdir -p "$install_dir"
-
-# Setup environment variables.
-export LD_LIBRARY_PATH="$install_dir/lib:$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH="$install_dir/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`:$LD_LIBRARY_PATH"
-export PKG_CONFIG_PATH="$install_dir/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PKG_CONFIG_PATH="$install_dir/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/pkgconfig:$PKG_CONFIG_PATH"
-
-install_dependency()
-{
- echo "--> Compiling $1"
- mkdir -p "$build_dir/$1"
- cd "$build_dir"
- $git_clone "git://github.com/$1" "$1"
- cd "$build_dir/$1"
- cmake . -DCMAKE_INSTALL_PREFIX:STRING="$install_dir"
- make install
-}
-
-# Retrieve jrl-mathtools
-install_dependency jrl-umi3218/jrl-mathtools
-install_dependency jrl-umi3218/jrl-mal
-install_dependency stack-of-tasks/dynamic-graph
-
-# Compile and run tests
-cd "$build_dir"
-cmake "$root_dir" -DCMAKE_INSTALL_PREFIX="$install_dir" \
- -DCMAKE_CXX_FLAGS="--coverage" \
- -DCMAKE_EXE_LINKER_FLAGS="--coverage" \
- -DCMAKE_MODULE_LINKER_FLAGS="--coverage" \
- -DCMAKE_INSTALL_PREFIX:STRING="$install_dir"
-make
-make test
-make install
--
GitLab