From 693ae495d750763117ec79c932733b7468d32a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 8 Apr 2019 16:19:54 +0200 Subject: [PATCH] Adjust tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .drone.yml | 10 +++++----- tests/integration/composer.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index e066b1365..b556f34f0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,7 +62,7 @@ trigger: --- kind: pipeline -name: deck-unit +name: unit steps: - name: php7.0 image: nextcloudci/php7.0:php7.0-17 @@ -138,13 +138,13 @@ trigger: - push --- kind: pipeline -name: deck-integration +name: integration steps: - name: integration - image: nextcloudci/integration-php7.0:integration-php7.0-6 + image: nextcloudci/php7.1:php7.1-16 environment: APP_NAME: deck - CORE_BRANCH: stable15 + CORE_BRANCH: master DB: sqlite commands: # Pre-setup steps @@ -165,7 +165,7 @@ trigger: --- kind: pipeline -name: deck-frontend +name: frontend steps: - name: eslint image: nextcloudci/eslint:eslint-1 diff --git a/tests/integration/composer.json b/tests/integration/composer.json index 0d3700061..6cd10678e 100644 --- a/tests/integration/composer.json +++ b/tests/integration/composer.json @@ -11,8 +11,8 @@ "../../../../build/integration/features/bootstrap/Auth.php", "../../../../build/integration/features/bootstrap/Provisioning.php", "../../../../build/integration/features/bootstrap/Sharing.php", - "../../../../build/integration/features/bootstrap/Trashbin.php", - "../../../../build/integration/features/bootstrap/WebDav.php" + "../../../../build/integration/features/bootstrap/WebDav.php", + "../../../../build/integration/features/bootstrap/Trashbin.php" ], "psr-0": { "": [