Revert "enable trigger & disable travis codecov"

This reverts commit 98de833d

diff --git a/.drone.yml b/.drone.yml
index ada824ab5eb40b8242de736f99395518aa0ee942..d152579797f45b71e6e54c7f24a83a21d459caad 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,7 +24,7 @@ services:
     MYSQL_USER: friendica
     MYSQL_PASSWORD: friendica
     MYSQL_DATABASE: friendica
-  volumes: 
+  volumes:
     - name: cache
       path: /var/lib/mysql
 
@@ -32,14 +32,14 @@ volumes:
 - name: cache
   temp: {}
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: mysql8.0-php7.2
@@ -75,14 +75,14 @@ volumes:
   - name: cache
     temp: {}
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: mysql8.0-php7.3
@@ -118,14 +118,14 @@ volumes:
   - name: cache
     temp: {}
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: mariadb10.1-php7.1
@@ -165,14 +165,14 @@ volumes:
   - name: cache
     temp: {}
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: mariadb10.1-php7.2
@@ -207,14 +207,14 @@ volumes:
   - name: cache
     temp: {}
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: mariadb10.1-php7.3
@@ -249,6 +249,14 @@ volumes:
   - name: cache
     temp: {}
 
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: redis-php7.1
@@ -270,14 +278,14 @@ services:
 - name: redis
   image: redis
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: redis-php7.2
@@ -294,14 +302,14 @@ services:
 - name: redis
   image: redis
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: redis-php7.3
@@ -318,6 +326,15 @@ services:
 - name: redis
   image: redis
 
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
+
 ---
 kind: pipeline
 name: memcache-php7.1
@@ -339,14 +356,14 @@ services:
 - name: memcached
   image: memcached
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: memcache-php7.2
@@ -363,14 +380,14 @@ services:
 - name: memcached
   image: memcached
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: memcache-php7.3
@@ -387,6 +404,16 @@ services:
 - name: memcached
   image: memcached
 
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
+
+
 ---
 kind: pipeline
 name: memcached-php7.1
@@ -408,14 +435,14 @@ services:
 - name: memcached
   image: memcached
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: memcached-php7.2
@@ -432,14 +459,14 @@ services:
 - name: memcached
   image: memcached
 
-trigger:
-  branch:
-    - master
-    - develop
-    - "*-rc"
-  event:
-    - pull_request
-    - push
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push
 ---
 kind: pipeline
 name: memcached-php7.3
@@ -455,3 +482,12 @@ steps:
 services:
 - name: memcached
   image: memcached
+
+#trigger:
+#  branch:
+#    - master
+#    - develop
+#    - "*-rc"
+#  event:
+#    - pull_request
+#    - push

diff --git a/.travis.yml b/.travis.yml
index 95333b6c9e5188d8271cc8b5a9afe7063ded2438..e306787ff16af3fc3e31c027f86a6d3cbcba1618 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,6 @@ before_script:
  - phpenv config-add .travis/redis.ini
  - phpenv config-add .travis/memcached.ini
 
-script: vendor/bin/phpunit --configuration tests/phpunit.xml
+script: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
+
+after_success: bash <(curl -s https://codecov.io/bash)