Merge branch 'AUTOMATED_TESTING' into 3.1

Conflicts: .travis.yml
gordonbanderson · Dec 30, 2015 · c5f6dcc · c5f6dcc
2 parents 533b8a6 + f4c2b66
commit c5f6dcc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1,4 @@
+# for php-coveralls
+service_name: travis-ci
+coverage_clover: build/logs/clover.xml
+
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,10 @@ addons:
     packages:
       - tidy
 
+
+before_install:
+  - pip install --user codecov
+
 env:
   global:
     - DB=MYSQL CORE_RELEASE=3.1
@@ -48,3 +52,4 @@ after_success:
     - cd ~/build/$TRAVIS_REPO_SLUG
     - wget https://scrutinizer-ci.com/ocular.phar
     - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+    - codecov