Simplify Travis script. #301

.travis.yml

@@ -57,15 +57,13 @@ before_script:
   - ${CXX} --version
 
 script:
+  # Check build without libosrm
+  - make || travis_terminate 1
+  # Check build with libosrm installed only if relevant files have
+  # been modified.
   - CHANGED_FILES=`git diff --name-only master ${TRAVIS_COMMIT}`
-  # Check build without libosrm only if source files have been
-  # modified.
   - echo ${CHANGED_FILES}
-  - if echo ${CHANGED_FILES} | grep -v -e "\.h" -e "\.cpp"; then travis_terminate 0; fi
-  - make || travis_terminate 1
-  # Check build with libosrm installed only on master and if relevant
-  # files have been modified.
-  - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && echo ${CHANGED_FILES} | grep -v "libosrm_wrapper"; then travis_terminate 0; fi
+  - if echo ${CHANGED_FILES} | grep -v "libosrm_wrapper"; then travis_terminate 0; fi
   - make clean
   - cd ${ROOT_FOLDER}
   - sudo apt-get install build-essential git cmake pkg-config libbz2-dev libstxxl-dev libstxxl1v5 libxml2-dev libzip-dev lua5.2 liblua5.2-dev libtbb-dev libluabind-dev libluabind0.9.1v5