Skip to content

Commit

Permalink
Merge 78fb7f1 into 6d81364
Browse files Browse the repository at this point in the history
  • Loading branch information
GeLoLabs committed Feb 25, 2017
2 parents 6d81364 + 78fb7f1 commit 31d4bf0
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
.scrutinizer.yml export-ignore
.travis.yml export-ignore
CONTRIBUTING.md export-ignore
appveyor.yml export-ignore
docker-compose.yml export-ignore
phpunit.xml.dist export-ignore
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# README

[![Build Status](https://travis-ci.org/egeloen/IvorySerializerBundle.svg?branch=master)](http://travis-ci.org/egeloen/IvorySerializerBundle)
[![Travis Build Status](https://travis-ci.org/egeloen/IvorySerializerBundle.svg?branch=master)](http://travis-ci.org/egeloen/IvorySerializerBundle)
[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/8ydvhbgwsy0k39ux/branch/master?svg=true)](https://ci.appveyor.com/project/egeloen/ivoryserializerbundle/branch/master)
[![Code Coverage](https://scrutinizer-ci.com/g/egeloen/IvorySerializerBundle/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/egeloen/IvorySerializerBundle/?branch=master)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egeloen/IvorySerializerBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egeloen/IvorySerializerBundle/?branch=master)
[![Dependency Status](http://www.versioneye.com/php/egeloen:serializer-bundle/badge.svg)](http://www.versioneye.com/php/egeloen:serializer-bundle)
Expand Down
37 changes: 37 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
build: false
clone_folder: c:\project

platform:
- x86
- x64

branches:
only:
- master

cache:
- c:\php -> appveyor.yml

init:
- SET PATH=c:\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET PHP=1

install:
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
- cd c:\php
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.0.0-nts-Win32-VC14-%platform%.zip
- IF %PHP%==1 7z x php-7.0.0-nts-Win32-VC14-%platform%.zip -y >nul
- IF %PHP%==1 del /Q *.zip
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
- IF %PHP%==1 copy /Y php.ini-development php.ini
- IF %PHP%==1 echo extension_dir=ext >> php.ini
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
- appveyor DownloadFile https://getcomposer.org/composer.phar
- cd c:\project
- composer update --prefer-source

test_script:
- cd c:\project
- vendor\bin\phpunit.bat
3 changes: 2 additions & 1 deletion travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
set -e

DOCKER_BUILD=${DOCKER_BUILD-false}
TRAVIS_PHP_VERSION=${TRAVIS_PHP_VERSION-5.6}

if [ "$DOCKER_BUILD" = false ]; then
vendor/bin/phpunit --coverage-clover build/clover.xml
vendor/bin/phpunit `if [ ! "$TRAVIS_PHP_VERSION" = "hhvm" ]; then echo "--coverage-clover build/clover.xml"; fi`
fi

if [ "$DOCKER_BUILD" = true ]; then
Expand Down
3 changes: 2 additions & 1 deletion travis/success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
set -e

DOCKER_BUILD=${DOCKER_BUILD-false}
TRAVIS_PHP_VERSION=${TRAVIS_PHP_VERSION-5.6}

if [ "$DOCKER_BUILD" = false ]; then
if [ "$DOCKER_BUILD" = false ] && [ ! "$TRAVIS_PHP_VERSION" = "hhvm" ]; then
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
fi

0 comments on commit 31d4bf0

Please sign in to comment.