From 2489caebd7e5e3d28e29404bee89422f1fc6b5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 4 Dec 2014 14:05:59 +0100 Subject: [PATCH] Move runkit installation to external script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes easier to read .travis.yml and also allows us to measure time it takes. Signed-off-by: Michal Čihař --- .travis.yml | 20 +------------------- test/install-runkit | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 19 deletions(-) create mode 100755 test/install-runkit diff --git a/.travis.yml b/.travis.yml index 7125054a1b..312e751f83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,26 +29,8 @@ before_script: - export PATH=~/.composer/vendor/bin/:$PATH - mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')" ; - composer install --dev --no-interaction + - if [ -z "$LINT" - a$TRAVIS_PHP_VERSION != "hhvm" ] ; then ./test/install-runkit ; fi - set -e ; if [ -z "$LINT" ] ; then - - if [ $TRAVIS_PHP_VERSION != "hhvm" ] ; then - - git clone --depth=1 git://github.com/zenovich/runkit.git ; - cd runkit ; - if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then - wget https://github.com/zenovich/runkit/pull/71.diff ; - patch -p1 < 71.diff ; - fi ; - phpize ; - ./configure ; - make ; - make install ; - cd .. ; - - phpenv config-add test/travis.php.ini ; - - fi ; - if [ ! -z "$SELENIUM" ] ; then php --server 127.0.0.1:8000 & diff --git a/test/install-runkit b/test/install-runkit new file mode 100755 index 0000000000..5e0523b9e3 --- /dev/null +++ b/test/install-runkit @@ -0,0 +1,15 @@ +#!/bin/sh + +git clone --depth=1 git://github.com/zenovich/runkit.git +cd runkit +if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then + wget https://github.com/zenovich/runkit/pull/71.diff + patch -p1 < 71.diff +fi +phpize +./configure +make +make install +cd .. + +phpenv config-add test/travis.php.ini