From 2d134575af943a8203825f42e90746cf1d718381 Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Fri, 27 Sep 2013 15:05:56 +0900
Subject: [PATCH] [travis] Use jrl-travis
---
.gitmodules | 3 +++
.travis | 1 +
.travis.yml | 56 ++++++++++++++++++++++++++-------------------------
.travis/build | 47 ------------------------------------------
cmake | 2 +-
5 files changed, 34 insertions(+), 75 deletions(-)
create mode 160000 .travis
delete mode 100755 .travis/build
diff --git a/.gitmodules b/.gitmodules
index 4a94cba..5a0f6c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,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.git
diff --git a/.travis b/.travis
new file mode 160000
index 0000000..5f856a6
--- /dev/null
+++ b/.travis
@@ -0,0 +1 @@
+Subproject commit 5f856a600e7ea80dae77507250ec7fc6a2dab488
diff --git a/.travis.yml b/.travis.yml
index 25e38d9..b321f24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,31 @@
-script: ./.travis/build
-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.git
-- git fetch origin gh-pages:gh-pages
-- cd _travis/build/doc && ../../../cmake/github/update-doxygen-doc.sh
-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
-- sudo pip install cpp-coveralls --use-mirrors
-compiler:
-- clang
-- gcc
-env:
- global:
- secure: VZsHMEVQT5ugtPedZE8bbqEEvnN9KqatLzfmlWIZ9rH0twzDw1xsNMlyIsBZzCe7VeiyUZQinCLWC3eWRSElk8ePqL9ZFl+Ddc17ngPjXqcf3YK9u3XJZvHqFPoLEPO9bh5nlBT+iMFdlqN3GG8SJMUzUuzu07X3CZy5e4RsqQo=
-notifications:
- email:
+language: cpp
+compiler:
+ - gcc
+ - clang
+env:
+ global:
+ - DEBSIGN_KEYID=5AE5CD75
+ - secure: "lEJYxth3fNsmvNS7Ern9+kEpHk4X3Tjo51GBUQBNL6g+YyZJKm4xwBEfwK+sewlmhY3oLUds+5H/2zE27q517kIcpP2Tlp4sRfooJfnBS7YYyF+1boxbvOXrZ2aqev3rzkyvKKMBg0UJTvAiSf7JgVCkMv33GeAX3/I+djEh23U="
+ - secure: "QTw5QQDaeQWBz6APcUCyl9P9UPI/T3j1++9o9fPxygS9R/7bQYNCrSH++owcAVCJgUI5oY3RmnYk/PjVygOLM0vbFqB2mMySibAhO/U3pSLtZ/HyPjqI9fX0TV/Cf7ji7soeXKk8p6kI2InMILpODLBaLdfm/jgCdAfecr5sGQI="
+ - secure: "JEcGQsUgEND64cAGVEHSxg8j7SlwofuYtLamANszs/h8FGYZ82rEjmG7r2zqSfBj/i1WsnSbTSsh8WJuXzvV8fw8enkcLEuJG9scQJzuzY8hnLe81o1fhEkclML0SLkLQ2Fu6rIqlKKeYwmJFFhSIj69ESRIkDhkjA1OrV7szzc="
+ - APT_DEPENDENCIES="doxygen libboost-dev libboost-test-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev liblapack-dev gfortran libeigen3-dev"
+ - GIT_DEPENDENCIES="jrl-mathtools jrl-mal"
+ - PPA_URI="stack-of-tasks/snapshot"
+ - NSIQCPPSTYLE_FILEFILTERPATH=cmake/filefilter.txt
+notifications:
+ hipchat:
+ rooms:
+ - secure: "SP8KX6gPzBT0BCpcL3ybK4Cgx7a7rmK3Hv/fD2lIf/RUdTwtzLh/J/l9xSYuMZisLe1tM+12vfP7r6t1RNdXrB7pSpYvFRNIWmyfBC7KnUFVn5rwxUnDPhKY3D/XaJ1cycbBJqJdUjYjFKCGEm4x6cpRRN61Ii66RAUvm1h9aHQ="
+ email:
- hpp-source@laas.fr
-branches:
- only:
+branches:
+ only:
- master
-language: cpp
-matrix:
- allow_failures:
- - compiler: clang
+ - 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 7f97413..0000000
--- a/.travis/build
+++ /dev/null
@@ -1,47 +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
-
-# 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
diff --git a/cmake b/cmake
index 1ad9845..5740c60 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 1ad984575ca91a4e19ce9eb9d092e92d09fcb7fb
+Subproject commit 5740c604bbd15729498eda8afc8f6c9acb67806c
--
GitLab