mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge branch '3.1' into 3.2
This commit is contained in:
commit
230094e65a
@ -2,6 +2,11 @@ language: php
|
|||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- tidy
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.composer/cache
|
- $HOME/.composer/cache
|
||||||
@ -44,9 +49,6 @@ matrix:
|
|||||||
env: DB=MYSQL
|
env: DB=MYSQL
|
||||||
- php: hhvm
|
- php: hhvm
|
||||||
env: DB=MYSQL
|
env: DB=MYSQL
|
||||||
before_install:
|
|
||||||
- sudo apt-get update -qq
|
|
||||||
- sudo apt-get install -y tidy
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- composer self-update || true
|
- composer self-update || true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user