From 29ae57034e06a70aa90aba56b9399a7b39c59d2a Mon Sep 17 00:00:00 2001 From: huangzhhui Date: Thu, 30 Aug 2018 12:28:55 +0800 Subject: [PATCH] Squashed 'src/service-governance/' changes from 9608c9bc..1e07a62d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1e07a62d Upstream some components travis ci config (https://github.com/swoft-cloud/swoft-component/pull/161) 88f2523f 修复Json Validator会失效的BUG (https://github.com/swoft-cloud/swoft-component/pull/153) git-subtree-dir: src/service-governance git-subtree-split: 1e07a62df8b9b06a0a5b02d91fb8b24dc9186e35 --- .travis.yml | 6 +++++- composer.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9624a4647..652872484 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,16 @@ language: php php: - 7.0 - 7.1 + - 7.2 install: - wget https://github.com/redis/hiredis/archive/v0.13.3.tar.gz -O hiredis.tar.gz && mkdir -p hiredis && tar -xf hiredis.tar.gz -C hiredis --strip-components=1 && cd hiredis && sudo make -j$(nproc) && sudo make install && sudo ldconfig && cd .. - - pecl install -f swoole-2.1.1 + - echo 'no' | pecl install -f redis + - wget https://github.com/swoole/swoole-src/archive/v4.0.2.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure --enable-async-redis && make -j$(nproc) && make install && cd - + - echo "extension = swoole.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini before_script: + - phpenv config-rm xdebug.ini - composer update script: composer test diff --git a/composer.json b/composer.json index ebe1cebdd..1b1fd1658 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "repositories": [ { "type": "composer", - "url": "https://packagist.phpcomposer.com" + "url": "https://packagist.laravel-china.org" } ], "scripts": {