From: Dan Brown <redacted>
Date: Sun, 19 Jun 2016 18:30:43 +0000 (+0100)
Subject: Travis CI updates (#130)
X-Git-Tag: v0.11.0~1^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e584b4926f5c4059f7896d3f25aa080dd4dc8c5a

Travis CI updates (#130)

* Updated travis config to use mysql

* Added cache for composer
---

diff --git a/.travis.yml b/.travis.yml
index ff387bd3d..83e9e10f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+dist: trusty
+sudo: required
 language: php
 php:
   - 7.0
@@ -5,15 +7,21 @@ php:
 cache:
   directories:
     - vendor
+    - node_modules
+    - $HOME/.composer/cache
 
 addons:
-  mariadb: '10.0'
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
 
 before_install:
   - npm install -g npm@latest
 
 before_script:
-  - mysql -e 'create database `bookstack-test`;'
+  - mysql -u root -e 'create database `bookstack-test`;'
   - composer config -g github-oauth.github.com $GITHUB_ACCESS_TOKEN
   - phpenv config-rm xdebug.ini
   - composer self-update