diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/android/configure.sh | 2 | ||||
-rw-r--r-- | scripts/android/defaults.mk | 2 | ||||
-rwxr-xr-x | scripts/ios/framework.sh | 1 | ||||
-rwxr-xr-x | scripts/linux/after_script.sh | 15 | ||||
-rw-r--r-- | scripts/linux/configure.sh | 1 | ||||
-rw-r--r-- | scripts/osx/configure.sh | 1 |
6 files changed, 19 insertions, 3 deletions
diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh index 2642584415..ff3d88b546 100644 --- a/scripts/android/configure.sh +++ b/scripts/android/configure.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash BOOST_VERSION=1.59.0 -LIBCURL_VERSION=7.45.0 -OPENSSL_VERSION=1.0.1p LIBPNG_VERSION=1.6.18 JPEG_VERSION=v9a SQLITE_VERSION=3.9.1 diff --git a/scripts/android/defaults.mk b/scripts/android/defaults.mk index 436f9db710..29f047c887 100644 --- a/scripts/android/defaults.mk +++ b/scripts/android/defaults.mk @@ -1,7 +1,7 @@ HEADLESS ?= none PLATFORM ?= android ASSET ?= zip -HTTP ?= curl +HTTP ?= android CACHE ?= sqlite GYP_FLAVOR_SUFFIX=-android diff --git a/scripts/ios/framework.sh b/scripts/ios/framework.sh index 81f7b35b93..1d1f755794 100755 --- a/scripts/ios/framework.sh +++ b/scripts/ios/framework.sh @@ -23,6 +23,7 @@ cp -rv ../../../../ios/framework/Settings.bundle Mapbox.framework/Settings.bundl # binary cp -v ../static/libMapbox.a Mapbox.framework/Mapbox +strip -Sx Mapbox.framework/Mapbox # module map mkdir Mapbox.framework/Modules diff --git a/scripts/linux/after_script.sh b/scripts/linux/after_script.sh new file mode 100755 index 0000000000..f8e4bc3486 --- /dev/null +++ b/scripts/linux/after_script.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -o pipefail + +if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then + # Install and add awscli to PATH for uploading the results + pip install --user awscli + export PATH="`python -m site --user-base`/bin:${PATH}" + + REPO_NAME=$(basename $TRAVIS_REPO_SLUG) + + aws s3 cp --recursive --acl public-read test/fixtures/annotations \ + s3://mapbox/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/annotations +fi diff --git a/scripts/linux/configure.sh b/scripts/linux/configure.sh index f270c903ee..6a88c13c01 100644 --- a/scripts/linux/configure.sh +++ b/scripts/linux/configure.sh @@ -15,6 +15,7 @@ GEOJSONVT_VERSION=2.1.6.3 VARIANT_VERSION=1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 +PIXELMATCH_VERSION=0.9.0 function print_opengl_flags { CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN diff --git a/scripts/osx/configure.sh b/scripts/osx/configure.sh index 34024a40f4..823e3b6260 100644 --- a/scripts/osx/configure.sh +++ b/scripts/osx/configure.sh @@ -15,3 +15,4 @@ GEOJSONVT_VERSION=2.1.6.3 VARIANT_VERSION=1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 +PIXELMATCH_VERSION=0.9.0 |