Working towards standard directory names

This commit is contained in:
Joshua Sherman 2014-01-20 22:23:04 -05:00
parent 293f618bef
commit e2f8464c51
5 changed files with 10 additions and 18 deletions

1
.gitignore vendored
View file

@ -8,6 +8,7 @@
!.travis.yml !.travis.yml
!.coveralls.yml !.coveralls.yml
*~ *~
vendor
# Global/OSX.gitignore # # Global/OSX.gitignore #
######################## ########################

View file

@ -16,23 +16,25 @@ services:
install: install:
- composer install - composer install
- cd vendors/php-test-helpers - mkdir vendor/php-test-helpers
- git clone git@github.com:php-test-helpers/php-test-helpers.git /tmp/php-test-helpers
- cd vendor/php-test-helpers
- phpize - phpize
- ./configure --enable-test-helpers - ./configure --enable-test-helpers
- make - make
- sudo make install - sudo make install
- cd ../../ - cd -
before_script: before_script:
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "zend_extension = /home/travis/build/joshtronic/pickles/vendors/php-test-helpers/modules/test_helpers.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini - echo "zend_extension = /home/travis/build/joshtronic/pickles/vendor/php-test-helpers/modules/test_helpers.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
- mysql test < tests/schema.sql - mysql test < tests/schema.sql
- mkdir -p vendors/build/logs - mkdir -p vendor/build/logs
script: script:
- phpunit --colors --coverage-clover /home/travis/build/joshtronic/pickles/vendors/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests - phpunit --colors --coverage-clover /home/travis/build/joshtronic/pickles/vendor/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests
after_success: after_success:
- php vendors/composer/bin/coveralls --config ../.coveralls.yml -v - php vendor/composer/bin/coveralls --config ../.coveralls.yml -v

View file

@ -1,13 +1,4 @@
{ {
"config": {
"vendor-dir": "vendors/composer"
},
"repositories": [
{
"url": "https://github.com/joshtronic/php-ayah.git",
"type": "git"
}
],
"require-dev": { "require-dev": {
"mikey179/vfsStream": "1.2.0", "mikey179/vfsStream": "1.2.0",
"satooshi/php-coveralls": "dev-master" "satooshi/php-coveralls": "dev-master"

2
composer.lock generated
View file

@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "d1441533619d080c356f9315ce68b9df", "hash": "f99ed048919043a93dd99173e2faada9",
"packages": [ "packages": [
{ {
"name": "devize/closure-compiler", "name": "devize/closure-compiler",

View file

@ -1,2 +0,0 @@
*
!.gitignore