From 2fece55b0e5d6d455e538d978c114b4530047581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sat, 13 Jan 2018 10:43:19 +0100
Subject: [PATCH] Use travis for codecov
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .drone.yml  |  6 ------
 .travis.yml | 10 ++++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d045d48c3..0b3fd8356 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -97,14 +97,8 @@ pipeline:
       - cd ../server/
       - ./occ app:enable $APP_NAME
       - cd apps/$APP_NAME
-
       - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
       - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
-
-      # Create coverage report
-      - wget https://codecov.io/bash -O codecov.sh
-      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t f6375299-4832-487e-b831-091772ab0384; fi"
-      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t f6375299-4832-487e-b831-091772ab0384; fi"
     when:
       matrix:
         TESTS: php5.6
diff --git a/.travis.yml b/.travis.yml
index a5b433770..2a9c11511 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 language: php
-dist: trusty
-sudo: required
 services:
     - mysql
 php:
@@ -17,19 +15,20 @@ matrix:
     exclude:
         - php: 7.2
           env: CORE_BRANCH=stable12 DB=mysql
+        - php: 5.6
+          env: CORE_BRANCH=master DB=mysql
 
 before_install:
     - wget https://phar.phpunit.de/phpunit-5.7.phar
     - chmod +x phpunit-5.7.phar
     - mkdir bin
-    - sudo mv phpunit-5.7.phar bin/phpunit
+    - mv phpunit-5.7.phar bin/phpunit
     - export PATH="$PWD/bin:$PATH"
     - phpunit --version
     - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - bash ./before_install.sh deck $CORE_BRANCH $DB
     - cd ../server
     - ./occ app:enable deck
-    - php -S localhost:8080 &
 
 before_script:
     - cd apps/deck
@@ -37,6 +36,9 @@ before_script:
 script:
     - make test-unit
 
+after_success:
+    - bash <(curl -s https://codecov.io/bash)
+
 after_failure:
     - cat ../../data/nextcloud.log