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/)
This commit is contained in:
Ferenc Kovacs 2014-12-04 11:12:42 +01:00
commit f8e7b3d166
3 changed files with 5 additions and 6 deletions

View File

@ -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

View File

@ -314,7 +314,7 @@ VALGRIND : " . ($leak_check ? $valgrind_header : 'Not used') . "
define('PHP_QA_EMAIL', 'qa-reports@lists.php.net');
define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php');
define('QA_REPORTS_PAGE', 'http://qa.php.net/reports');
define('TRAVIS_CI' , (bool) getenv('TRAVIS_PHP_VERSION'));
define('TRAVIS_CI' , (bool) getenv('TRAVIS'));
function save_or_mail_results()
{

2
travis/install.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
sudo apt-get install re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev