summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-09-20 17:13:24 +0200
committerFabio Bas <ctrlaltca@gmail.com>2013-09-20 17:13:24 +0200
commit60c6bfa6f7caeb122cb8fa820506bdd1c54a842e (patch)
treef1f6c683f1028b5be8a46e78f7c43e03c5dc52ee
parent67752e244fcf1dfbc12aff76fdbd6e5a70c83fcd (diff)
Attempt to fix travis build, nth attempt
-rw-r--r--.travis.yml3
-rw-r--r--travis.php.ini1
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 30ccf1c9..e0cf018e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,10 @@ before_script:
- composer self-update
- composer install --prefer-source --dev
- export PATH=./bin/:$PATH
+ - phpenv config-add travis.php.ini
script:
- ./bin/phing test
after_script:
- - php -d memory_limit=1G ./bin/coveralls -v \ No newline at end of file
+ - php ./bin/coveralls -v \ No newline at end of file
diff --git a/travis.php.ini b/travis.php.ini
new file mode 100644
index 00000000..03a47372
--- /dev/null
+++ b/travis.php.ini
@@ -0,0 +1 @@
+memory_limit = 1024M \ No newline at end of file