diff --git a/.travis.yml b/.travis.yml index 7f5c73377..edcd19565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,12 +23,12 @@ env: - secure: "R/+uOeccl7GqjJbknailAV7VtjAtGwHHM9xToVnhfPVUXp9fzJs+oNk3IWcs3Eg4sw4WsYxXRfbCQG9bA3MnPlTOsxETGRioO9CAuXap6mwcwNAzeWuq7ePFki2u01pJGQD5b6WFqBCdnAQ4o2SgHgGzhs0TJzYd9tONQxSmkCI=" - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I=" - AWS_S3_BUCKET: 'node-mapbox-gl-native' + - LD_LIBRARY_PATH: '/usr/local/lib' before_install: - source ./scripts/travis_helper.sh - source ./scripts/flags.sh - ./scripts/travis_before_install.sh -- glxinfo install: - make setup diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 2fd9200c2..12fdd9788 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -34,9 +34,11 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \ --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \ make && sudo make install && \ - export LD_LIBRARY_PATH=/usr/local/lib && \ cd ../ + mapbox_time "glxinfo" \ + glxinfo + mapbox_time "install_opengl" \ sudo apt-get -y install libxi-dev x11proto-randr-dev \ x11proto-xext-dev libxrandr-dev \