tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove travis default installed libs which might conflict

Browse Source
This commit is contained in:
artemp
2014-11-14 19:00:15 +01:00
parent 761b2ba583
commit 23d3588f50
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/travis_script.sh
View File

@@ -10,6 +10,10 @@ 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}
@@ -26,9 +30,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