From 04e008c508f7b8ed1378907849aa68bea6419c6f Mon Sep 17 00:00:00 2001 From: Joshua Sherman Date: Sat, 11 Jan 2014 16:23:06 -0500 Subject: [PATCH] Moved composer out of the private directory Unsure if that's why I couldn't make the file, thinking of perhaps making the log directory part of the directory structure instead of creating it on the fly in Travis CI. --- .travis.yml | 4 ++-- composer.json | 2 +- composer.lock | 2 +- vendors/composer/.gitignore | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 vendors/composer/.gitignore diff --git a/.travis.yml b/.travis.yml index cf7113b..12c29f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ install: - composer install script: - - mkdir -p .composer/build/logs - - phpunit --coverage-clover .composer/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests + - mkdir -p vendors/composer/build/logs + - phpunit --coverage-clover vendors/composer/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests after_script: - php .composer/bin/coveralls --config .coveralls.yml -v diff --git a/composer.json b/composer.json index 9f639e2..202b523 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "config": { - "vendor-dir": ".composer" + "vendor-dir": "vendors/composer" }, "require": { "devize/closure-compiler": "@dev", diff --git a/composer.lock b/composer.lock index c69d244..0fbb8c8 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "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" ], - "hash": "a7bdd9db7c3361000e485b42f5d495d3", + "hash": "485fce2d03ad9e34cecb409899f06a37", "packages": [ { "name": "devize/closure-compiler", diff --git a/vendors/composer/.gitignore b/vendors/composer/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/vendors/composer/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore