[Pkg-javascript-commits] [leaflet-markercluster] 65/128: Fix travis build

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet-markercluster.

commit 49a4dc4455f197bcda677089c4ef3667b1550b95
Author: Michał Łazowik <mlazowik at gmail.com>
Date:   Wed Jul 20 21:01:27 2016 +0200

    Fix travis build
---
 .travis.yml  | 18 +++++++++++++++++-
 package.json |  3 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c492889..5d99e23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,20 @@
 sudo: false
 language: node_js
 node_js:
-  - 0.10
\ No newline at end of file
+  - 6
+cache:
+  directories:
+    - "travis_phantomjs"
+before_install:
+  - "export PHANTOMJS_VERSION=2.1.1"
+  - "hash -r"
+  - "phantomjs --version"
+  - "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
+  - "hash -r"
+  - "phantomjs --version"
+  - "if [ $(phantomjs --version) != \"$PHANTOMJS_VERSION\" ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+  - "hash -r"
+  - "if [ $(phantomjs --version) != \"$PHANTOMJS_VERSION\" ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != \"$PHANTOMJS_VERSION\" ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+  - "hash -r"
+  - "phantomjs --version"
\ No newline at end of file
diff --git a/package.json b/package.json
index 742728b..0d48a70 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
 		"karma": "~0.8.5",
 		"uglify-js": "~2.3.6",
 		"jake": "~0.5.16",
-		"magic-string": "^0.7.0"
+		"magic-string": "^0.7.0",
+		"leaflet": "~1.0.0-rc.1"
 	},
 	"main": "dist/leaflet.markercluster.js",
 	"scripts": {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git