From 8ca3e5d32e69a16b7edea8b54de80e3d8860cac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <github@jus.li>
Date: Sat, 13 Jan 2018 12:26:27 +0100
Subject: [PATCH] Bump drone images (#391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump drone images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* Use travis for codecov

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* Just test against master in travis

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

diff --git a/.drone.yml b/.drone.yml
index 00fe1844e..0b3fd8356 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,7 +5,7 @@ clone:
 
 pipeline:
   check-app-compatbility:
-    image: nextcloudci/php5.6:php5.6-3
+    image: nextcloudci/php7.0:php7.0-17
     environment:
       - APP_NAME=deck
       - CORE_BRANCH=master
@@ -23,16 +23,14 @@ pipeline:
       matrix:
         TESTS: check-app-compatbility
   signed-off-check:
-    image: nextcloudci/php7.0:php7.0-2
+    image: nextcloudci/php7.0:php7.0-17
     environment:
       - APP_NAME=deck
       - CORE_BRANCH=master
       - DB=sqlite
     commands:
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      - php ./build/signed-off-checker.php
+      - wget https://raw.githubusercontent.com/nextcloud/server/master/build/signed-off-checker.php
+      - php ./signed-off-checker.php
     when:
       matrix:
         TESTS: signed-off-check
@@ -40,7 +38,7 @@ pipeline:
     image: nextcloudci/php5.6:php5.6-8
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable13
       - DB=sqlite
     commands:
       - composer install
@@ -88,7 +86,7 @@ pipeline:
     image: nextcloudci/php5.6:php5.6-8
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable13
       - DB=sqlite
     commands:
       - apt update && apt-get -y install php5-xdebug
@@ -99,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
@@ -166,7 +158,7 @@ pipeline:
       matrix:
         TESTS: php7.2
   integration:
-    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
     environment:
       - APP_NAME=deck
       - CORE_BRANCH=master
diff --git a/.travis.yml b/.travis.yml
index a5b433770..f2375f490 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,24 @@
 language: php
-dist: trusty
-sudo: required
 services:
     - mysql
 php:
-    - 5.6
     - 7.0
     - 7.1
     - 7.2
 env:
     - CORE_BRANCH=master DB=mysql
-    - CORE_BRANCH=stable13 DB=mysql
-    - CORE_BRANCH=stable12 DB=mysql 
-
-matrix:
-    exclude:
-        - php: 7.2
-          env: CORE_BRANCH=stable12 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 +26,9 @@ before_script:
 script:
     - make test-unit
 
+after_success:
+    - bash <(curl -s https://codecov.io/bash)
+
 after_failure:
     - cat ../../data/nextcloud.log