Skip to content
This repository has been archived by the owner on Mar 1, 2023. It is now read-only.

Commit

Permalink
fixes #185
Browse files Browse the repository at this point in the history
  • Loading branch information
anolilab committed Feb 12, 2016
1 parent f9282f8 commit 3905031
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ before_script:
- sleep 15
- mongo mydb_test --eval 'db.addUser("travis", "test");'
- ./build/travis/all.sh
- if [ "$TRAVIS_PHP_VERSION" = 5.6 ]; then ./build/travis/php/5.x.sh; fi
- if [ "$TRAVIS_PHP_VERSION" = 7.0 ]; then ./build/travis/php/7.x.sh; fi
- if [ "$TRAVIS_PHP_VERSION" = hhvm ]; then ./build/travis/php/hhvm.sh; fi
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then ./build/travis/php/5.x.sh; fi
- if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then ./build/travis/php/7.x.sh; fi
- if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./build/travis/php/hhvm.sh; fi

script:
- ./build/travis/script.sh
Expand Down
6 changes: 3 additions & 3 deletions build/travis/after_success.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

# Send coverage to scrutinizer
if [[ "$TRAVIS_PHP_VERSION" != hhvm && "$CHECK_CS" = true && "$SEND_COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
if [[ "$TRAVIS_PHP_VERSION" != hhvm && "$CHECK_CS" = true && "$SEND_COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.xml; fi
if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$CHECK_CS" = true && "$SEND_COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$CHECK_CS" = true && "$SEND_COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.xml; fi

# Run codecov
if [[ "$TRAVIS_PHP_VERSION" != hhvm && "$CHECK_CS" = true && "$SEND_COVERAGE" = true ]]; then bash <(curl -s https://codecov.io/bash); fi
if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$CHECK_CS" = true && "$SEND_COVERAGE" = true ]]; then bash <(curl -s https://codecov.io/bash); fi
4 changes: 2 additions & 2 deletions build/travis/all.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# Disable xdebug when hhvm or when SEND_COVERAGE is false
if [[ "$TRAVIS_PHP_VERSION" != hhvm && "$CHECK_CS" != true && "$SEND_COVERAGE" != true ]]; then phpenv config-rm xdebug.ini; fi
if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$CHECK_CS" != true && "$SEND_COVERAGE" != true ]]; then phpenv config-rm xdebug.ini; fi

# Doing something with phpenv
if [ "$TRAVIS_PHP_VERSION" != hhvm ]; then phpenv config-add ./build/travis/php/php.ini; fi
if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-add ./build/travis/php/php.ini; fi
4 changes: 2 additions & 2 deletions build/travis/php/5.x.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# Install libevent
if [ "$ADAPTER" = Libevent ]; then (echo "yes" | pecl install "channel://pecl.php.net/libevent-0.1.0"); fi
if [ "$ADAPTER" = "Libevent" ]; then (echo "yes" | pecl install "channel://pecl.php.net/libevent-0.1.0"); fi

# Install ev
if [ "$ADAPTER" = Ev ]; then (echo "yes" | pecl install ev); fi
if [ "$ADAPTER" = "Ev" ]; then (echo "yes" | pecl install ev); fi
4 changes: 2 additions & 2 deletions build/travis/php/7.x.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env bash

# Install Libuv
if [ "$ADAPTER" = Libuv ]; then (mkdir libuv && (curl -L https://github.com/libuv/libuv/archive/v1.6.1.tar.gz | tar xzf -) && cd libuv-1.6.1 && ./autogen.sh && ./configure --prefix=$(readlink -f `pwd`/../libuv) && make && make install && cd ..); fi
if [ "$ADAPTER" = "Libuv" ]; then (mkdir libuv && (curl -L https://github.com/libuv/libuv/archive/v1.6.1.tar.gz | tar xzf -) && cd libuv-1.6.1 && ./autogen.sh && ./configure --prefix=$(readlink -f `pwd`/../libuv) && make && make install && cd ..); fi

# Install Uv
if [ "$ADAPTER" = Uv ]; then (git clone https://github.com/bwoebi/php-uv && cd php-uv && phpize && ./configure --with-uv=$(readlink -f `pwd`/../libuv) && make install && (echo "extension = uv.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) && cd ..); fi
if [ "$ADAPTER" = "Uv" ]; then (git clone https://github.com/bwoebi/php-uv && cd php-uv && phpize && ./configure --with-uv=$(readlink -f `pwd`/../libuv) && make install && (echo "extension = uv.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) && cd ..); fi

# Remove flysystem-azure
composer remove league/flysystem-azure --dev --no-update
2 changes: 1 addition & 1 deletion build/travis/runTest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ composer install --no-interaction --prefer-source --ignore-platform-reqs --quiet
TEST="./vendor/bin/phpunit $2"

printf "Command: $TEST\n\n"
if [ "$TRAVIS_PHP_VERSION" == '7.0' ]
if [ "$TRAVIS_PHP_VERSION" == "7.0" ]
then
phpdbg -qrr $TEST
else
Expand Down
1 change: 1 addition & 0 deletions build/travis/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Run for each components
COMPONENTS=$(find src/Viserio/ -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n')

if [ command -v parallel >/dev/null 2>&1 ]
then
# Exists
Expand Down
5 changes: 4 additions & 1 deletion build/travis/script.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# Create logs dir
mkdir -p build/logs

./build/travis/runTests.sh
if [[ "$TRAVIS_PHP_VERSION" != hhvm && "$CHECK_CS" != true && "$SEND_COVERAGE" != true ]]; then vendor/bin/humbug; fi

if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$CHECK_CS" != true && "$SEND_COVERAGE" != true ]]; then vendor/bin/humbug; fi

0 comments on commit 3905031

Please sign in to comment.