More travis build jobs in matrix, move scripts into own dir

wxmerkt · May 6, 2016 · e378f06 · e378f06
1 parent 76a6b3c
commit e378f06
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,12 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libqt4-dev libqt4-opengl-dev libqglviewer-dev  
 before_script:
-  - mkdir build
-  - cd build
-  - cmake ..
-script: make && make test
+script: ./scripts/travis_build_jobs.sh $VARIANT
+env:
+  - VARIANT=dist
+  - VARIANT=components
+matrix:
+  exclude:
+    - compiler: clang
+      env: VARIANT=components
+
diff --git a/increase_version.py → scripts/increase_version.py b/increase_version.py → scripts/increase_version.py
diff --git a/scripts/travis_build_jobs.sh b/scripts/travis_build_jobs.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# travis build script for test compilations
+
+set -e
+
+function build {
+  cd $1
+  mkdir build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/octomap/$1
+  make -j4
+  cd ..
+}
+
+case "$1" in
+"dist")
+  build .
+  cd build && make test
+  make install
+  ;;
+"components")
+  build octomap
+  cd build && make test
+  make install
+  cd ../..
+  build dynamicEDT3D
+  cd ..
+  build octovis
+  cd ..
+  ;;
+*)
+  echo "Invalid build variant"
+  exit 1
+esac
+
+
+
+