Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data

[friendica.git] / .drone.yml

diff --git a/.drone.yml b/.drone.yml
index af3ff6c79007f97d063630f3c1e9ff122da886c7..ec99631355dfd71619a0c47e13ed346f6e2adf17 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -82,19 +82,9 @@ steps:
       - composer validate
       - composer install --prefer-dist
       - cp config/local-sample.config.php config/local.config.php
-      - while ! mysqladmin ping -h$MYSQL_HOST -P$MYSQL_PORT --silent; do sleep 1; done
+      - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
       - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
-      - phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
-  - name: Codecov
-    image: plugins/codecov
-    when:
-      repo:
-        - friendica/friendica
-    settings:
-      token:
-        from_secret: codecov-token
-      files:
-        - clover.xml
+      - phpunit --configuration tests/phpunit.xml
 
 services:
   - name: mariadb
@@ -129,11 +119,13 @@ steps:
       REDIS_HOST: "redis"
       MEMCACHED_HOST: "memcached"
       MEMCACHE_HOST: "memcached"
+      XDEBUG_MODE: "coverage"
     commands:
+      - phpenmod xdebug
       - composer validate
       - composer install --prefer-dist
       - cp config/local-sample.config.php config/local.config.php
-      - while ! mysqladmin ping -h$MYSQL_HOST -P$MYSQL_PORT --silent; do sleep 1; done
+      - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
       - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
       - phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
   - name: Codecov
@@ -184,19 +176,9 @@ steps:
       - composer validate
       - composer install --prefer-dist
       - cp config/local-sample.config.php config/local.config.php
-      - while ! mysqladmin ping -h$MYSQL_HOST -P$MYSQL_PORT --silent; do sleep 1; done
+      - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
       - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
-      - phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
-  - name: Codecov
-    image: plugins/codecov
-    when:
-      repo:
-        - friendica/friendica
-    settings:
-      token:
-        from_secret: codecov-token
-      files:
-        - clover.xml
+      - phpunit --configuration tests/phpunit.xml
 
 services:
   - name: mariadb