diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 4bd3333b5..ea6097dc5 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -10,10 +10,6 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # build & test Linux # - echo "removing potentially conflicting libraries" - # remove travis default installed libs which will conflict - sudo apt-get purge -qq -y libtiff* libjpeg* libpng3 - sudo apt-get autoremove -y -qq mapbox_time "compile_program" \ make linux -j$JOBS BUILDTYPE=${BUILDTYPE} @@ -30,9 +26,9 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then ./scripts/compare_images.sh if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - mapbox_time_start "deploy_results" - (cd ./test/suite/ && ./bin/deploy_results.sh) - mapbox_time_finish + mapbox_time_start "deploy_results" + (cd ./test/suite/ && ./bin/deploy_results.sh) + mapbox_time_finish fi elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then