hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
This commit is contained in:
Nicolas Le Goff
2014-01-27 17:23:03 +01:00
parent 6ba5ce6669 33447f7315
commit 383ff77449
8 changed files with 148 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -12,8 +12,8 @@ services:
before_script:
- node --version
- npm --version
- npm install
- npm install grunt-cli jake -g
- travis_retry npm install
- travis_retry npm install grunt-cli jake -g
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
- echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini
@@ -21,8 +21,8 @@ before_script:
- echo 'extension="memcached.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/memcached.ini
- yes | pecl install zmq-beta
- yes | pecl install imagick
- composer self-update
- composer install --dev --prefer-source
- travis_retry composer self-update
- travis_retry composer install --dev --prefer-source
- 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"
@@ -45,7 +45,7 @@ php:
script:
- bin/developer system:uninstall
- bin/developer dependencies:all --prefer-source
- travis_retry bin/developer dependencies:all --prefer-source
- sh -c " if [ '$SETUP_MODE' = 'update' ]; then
cp hudson/connexion.inc config/;
cp hudson/_GV.php config/;