php 7 is no more in 'allowed failures'

dsd-meetme · Dec 30, 2015 · c779941 · c779941
1 parent c88bafb
commit c779941
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -20,7 +20,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 1800
-        runs: 2
+        runs: 3
     php_code_coverage: false
     php_code_sniffer:
         config:

diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,6 @@ script: phpunit --coverage-text --coverage-clover=coverage.clover
 # fast_finish: If your build fails do not continue trying to build, just stop.
 matrix:
   allow_failures:
-    - php: 7.0
     - php: hhvm
 
 
@@ -45,5 +44,5 @@ notifications:
     slack: dsd-meetme:pZvZrzGoESPNVXScLAnMf10X
 
 after_script:
-  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
-  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;'
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;'