diff --git a/.drone.yml b/.drone.yml index ada824ab5e..887ccfdf0a 100644 --- 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 @@ -34,12 +34,12 @@ volumes: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: mysql8.0-php7.2 @@ -77,12 +77,12 @@ volumes: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: mysql8.0-php7.3 @@ -120,12 +120,12 @@ volumes: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: mariadb10.1-php7.1 @@ -167,12 +167,12 @@ volumes: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: mariadb10.1-php7.2 @@ -209,12 +209,12 @@ volumes: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-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 @@ -272,12 +280,12 @@ services: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: redis-php7.2 @@ -296,12 +304,12 @@ services: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-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 @@ -341,12 +358,12 @@ services: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: memcache-php7.2 @@ -365,12 +382,12 @@ services: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-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 @@ -410,12 +437,12 @@ services: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-rc" +# event: +# - pull_request +# - push --- kind: pipeline name: memcached-php7.2 @@ -434,12 +461,12 @@ services: trigger: branch: - - master +# - master - develop - - "*-rc" - event: - - pull_request - - push +# - "*-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 95333b6c9e..e306787ff1 100644 --- 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)