]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Thu, 4 Dec 2014 10:12:32 +0000 (11:12 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 4 Dec 2014 10:12:32 +0000 (11:12 +0100)
* 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/)

1  2 
.travis.yml
run-tests.php

diff --cc .travis.yml
index 2125e8d3d63f5b177563300dd1d80cd80787bdc7,19ecff50f69097311f35dad77d6bb5b867cab101..3baf50be3b7987e139bcff5ba695c707bc6ab738
@@@ -25,10 -21,9 +21,11 @@@ env
        - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
  
  before_install:
 +    - sudo apt-get update -qq
 +    - 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
diff --cc run-tests.php
Simple merge