Skip to content

Commit 9c5d84a

Browse files
committed
Merge branch 'PHP-5.5' into PHP-5.6
* 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/)
2 parents 52b41f2 + 4f9f7c7 commit 9c5d84a

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
language: php
2-
3-
php:
4-
# We only specify one version so we only get one worker
5-
- 5.4
1+
language: c
62

73
notifications:
84
email:
@@ -29,6 +25,7 @@ before_install:
2925
- sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
3026
- sudo cp ./travis/de /var/lib/locales/supported.d/de
3127
- sudo dpkg-reconfigure locales
28+
- ./travis/install.sh
3229

3330
before_script:
3431
# Compile PHP

run-tests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ function write_information($show_html)
314314
define('PHP_QA_EMAIL', 'qa-reports@lists.php.net');
315315
define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php');
316316
define('QA_REPORTS_PAGE', 'http://qa.php.net/reports');
317-
define('TRAVIS_CI' , (bool) getenv('TRAVIS_PHP_VERSION'));
317+
define('TRAVIS_CI' , (bool) getenv('TRAVIS'));
318318

319319
function save_or_mail_results()
320320
{

travis/install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
sudo apt-get install re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev

0 commit comments

Comments
 (0)