diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 15:14:21 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 15:14:21 +0200 |
| commit | 905c4294be495d15591885a2438ca0b8abc8decf (patch) | |
| tree | 851a94849eb7a1f3269b91de6054846cfbda722b /.travis.yml | |
| parent | c6e4cf2f80216c7139b6587dcd6d919080aef20d (diff) | |
| parent | 8954b3971f5cb90dc4b18e61b58ea6e41c54fffe (diff) | |
| download | qtlocation-mapboxgl-905c4294be495d15591885a2438ca0b8abc8decf.tar.gz | |
Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
common/http_request_baton_curl.cpp
include/mbgl/map/map.hpp
include/mbgl/util/uv_detail.hpp
scripts/travis_before_install.sh
setup-libraries.sh
src/map/map.cpp
src/storage/file_request_baton.cpp
src/storage/http_request.cpp
src/util/uv-messenger.c
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 058d4e8c74..bc714f77c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,13 @@ matrix: env: global: - - secure: "bG4YYWMfl9API0MSRgmOaJrlGLv06tRg9KJNawBieZvBJbITPpxVGJZT3/l/SEJ+Rl15e2dRex4k+MGQlmT2SqPQxTEYWv1qxNigKPPcla7IWeNmWWqW8uVvFjdglojgBOK2k/xErVQtA4zDfi3mwSXH4DKwquXWsoEKmX2SV7M=" - - secure: "Cbvap9ubVKgjPe3hUhI6JGeDZzBXHpOG9RaYKh+SdoIPhKnlJiNOYm1egomi+e4uqJInlFKuVHTw7Ng9Cun6Zm0jIxpkSchv1GpsR7hmB3UGnGed19Dw8121FwuUaktN+4YnbVlsyd+u8EHD3+h58t4eELrLrZolM4rS7DL6caA=" + - secure: "HPlPuLk531F7bCyADMcxQ+I1CfGhJlhX9A3q3auNCdLsjqaZbktaCIGuq4R1IPZz0UTtO8RfrTfVaoktyZdq2QyU3iD8oj6BeZ/Jypr4TCBJxI5IeyU3gyPMFHqUYIJuHL9k40Xu7Dhf4HT123zr8KoeVqCHauZP1/TumA0nezg=" + - secure: "R/+uOeccl7GqjJbknailAV7VtjAtGwHHM9xToVnhfPVUXp9fzJs+oNk3IWcs3Eg4sw4WsYxXRfbCQG9bA3MnPlTOsxETGRioO9CAuXap6mwcwNAzeWuq7ePFki2u01pJGQD5b6WFqBCdnAQ4o2SgHgGzhs0TJzYd9tONQxSmkCI=" - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I=" + - AWS_S3_BUCKET: 'node-mapbox-gl-native' before_install: +- source ./scripts/travis_helper.sh - source ./scripts/flags.sh - (git clone https://github.com/mapbox/mason.git ~/.mason ; sudo ln -s ~/.mason/mason /usr/local/bin/mason) - ./scripts/travis_before_install.sh |