summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-12-04 11:12:42 +0100
committerFerenc Kovacs <tyrael@php.net>2014-12-04 11:12:42 +0100
commitf8e7b3d166a4aba2ebd9469731b01ccd30065184 (patch)
tree77889efeb335a94284d4a7ff2038a3ea5fd6aa89 /.travis.yml
parent7e933c5ff89ae3dc8b48f94ad9c9a8bc77d93a25 (diff)
parent9c5d84ace1daaf2dcd08c04b9c138940afdf5001 (diff)
downloadphp-git-f8e7b3d166a4aba2ebd9469731b01ccd30065184.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: add initial install switch to C travis project instead of PHP use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index d9e11a07d2..418a4f28b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,4 @@
-language: php
-
-php:
- # We only specify one version so we only get one worker
- - 5.4
+language: c
branches:
except:
@@ -33,6 +29,7 @@ before_install:
- sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
- sudo cp ./travis/de /var/lib/locales/supported.d/de
- sudo dpkg-reconfigure locales
+ - ./travis/install.sh
before_script:
# Compile PHP