From feb584936c9a3c385f3522fbf7c0880d28097546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 8 Dec 2015 19:01:48 +0100 Subject: [PATCH] Change CI integrations installs --- .travis.yml | 2 +- circle.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1122bcca67..bb07d97263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,8 @@ before_install: - echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini - yes | pecl install imagick install: - - travis_retry npm install - travis_retry composer install --optimize-autoloader --dev --prefer-source + - travis_retry npm install before_script: - mysql -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;' - "./bin/developer system:uninstall" diff --git a/circle.yml b/circle.yml index 59626bd34a..23fa3b36f8 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,10 @@ dependencies: - pecl install json - yes '' | pecl install zmq-beta - sed -i 's/^\(session.cache_limiter = \).*/\1""/' ~/.phpenv/versions/$(phpenv global)/etc/php.ini + override: + - composer install --prefer-source --no-interaction post: + - npm install - if [[ ! -e elasticsearch-1.6.0 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz && tar -xvf elasticsearch-1.6.0.tar.gz && elasticsearch-1.6.0/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0; fi - elasticsearch-1.6.0/bin/elasticsearch: {background: true}