Merge pull request #6 from Lakion/cache-dir

Refactored Travis caching
FriendsOfBehat · Sep 14, 2015 · 2b7e62b · 2b7e62b
2 parents 6af4923 + 2c2bbba
commit 2b7e62b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,15 @@
 language: php
 
+env:
+  global:
+    - MINK_DEBUG_CACHE_DIR=$HOME/.mink-debug-cache
+
 cache:
   directories:
     - bin
     - vendor
     - $HOME/.composer/cache
-    - $HOME/.mink-log-cache
+    - $MINK_DEBUG_CACHE_DIR
 
 php:
   - 7.0
@@ -14,7 +18,7 @@ php:
   - hhvm
 
 before_install:
-  - mkdir -p $HOME/.mink-log-cache
+  - mkdir -p $MINK_DEBUG_CACHE_DIR
   - travis/run-selenium
 
 before_script:

diff --git a/travis/run-selenium b/travis/run-selenium
@@ -3,8 +3,8 @@
 sh -e /etc/init.d/xvfb start
 export DISPLAY=:99
 
-if [ ! -f $HOME/.mink-log-cache/selenium.jar ]; then
-    curl -s http://selenium-release.storage.googleapis.com/2.47/selenium-server-standalone-2.47.1.jar > $HOME/.mink-log-cache/selenium.jar
+if [ ! -f "$MINK_DEBUG_CACHE_DIR/selenium.jar" ]; then
+    curl -s http://selenium-release.storage.googleapis.com/2.47/selenium-server-standalone-2.47.1.jar > "$MINK_DEBUG_CACHE_DIR/selenium.jar"
 fi
 
-java -jar $HOME/.mink-log-cache/selenium.jar > /dev/null 2>&1 &
+java -jar "$MINK_DEBUG_CACHE_DIR/selenium.jar" > /dev/null 2>&1 &