Skip to content

Commit

Permalink
Merge branch 'PHP-5.5' into PHP-5.6
Browse files Browse the repository at this point in the history
* PHP-5.5:
  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/)
  • Loading branch information
Tyrael committed Dec 4, 2014
2 parents 52b41f2 + 4f9f7c7 commit 9c5d84a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
language: php

php:
# We only specify one version so we only get one worker
- 5.4
language: c

notifications:
email:
Expand All @@ -29,6 +25,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
Expand Down
2 changes: 1 addition & 1 deletion run-tests.php
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ function write_information($show_html)
define('PHP_QA_EMAIL', '[email protected]');
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()
{
Expand Down
2 changes: 2 additions & 0 deletions travis/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
sudo apt-get install re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev

0 comments on commit 9c5d84a

Please sign in to comment.