com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml
| From: | Stanislav Malyshev | Date: | Mon, 07 Jul 2014 17:42:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79298@lists.php.net to get a copy of this message | ||
Commit: 41448bff7cd00623f7b43e9aff0a443e7731e93b
Author: Stanislav Malyshev <stas@php.net> Mon, 7 Jul 2014 10:42:13 -0700
Parents: 31b395ac688d4d68de38c4efbc3c00fa9245c4eb 551696363332942d26209368f441f6f152be4769
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41448bff7cd00623f7b43e9aff0a443e7731e93b
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
create locales and re-add test
Conflicts:
.travis.yml
Changed paths:
MM .travis.yml
Diff:
diff --cc .travis.yml
index 8de7ee8,b2ed607..2125e8d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -22,8 -25,9 +25,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
+
before_script:
# Compile PHP
- ./travis/compile.sh