Merge branch '3.8'

This commit is contained in:
Romain Neutron
2013-12-20 16:46:35 +01:00
7 changed files with 16 additions and 16 deletions

View File

@@ -24,7 +24,6 @@ before_script:
- echo "extension=zmq.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- composer self-update
- composer install --dev --prefer-source
- bin/developer system:uninstall
- wget http://sphinxsearch.com/files/sphinx-2.0.6-release.tar.gz
- tar xzf sphinx-2.0.6-release.tar.gz
- sh -c "cd sphinx-2.0.6-release && wget http://snowball.tartarus.org/dist/libstemmer_c.tgz && tar xzf libstemmer_c.tgz && ./configure --with-libstemmer --with-iconv --with-mysql --enable-id64 --quiet && make -j --quiet && sudo make install"
@@ -50,6 +49,7 @@ php:
- 5.5
script:
- bin/developer system:uninstall
- bin/developer dependencies:all --prefer-source
- sh -c " if [ '$SETUP_MODE' = 'update' ]; then
cp hudson/connexion.inc config/;