summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-10-01 18:07:14 +0200
committerRobin Appelman <robin@icewind.nl>2020-10-08 14:08:47 +0200
commit67ff7c85a2bd3c9dbba41785715648b69b11e1df (patch)
treeee2ff919c075f3c2a04b5aada0d1da872d88bd9c
parentb2a7b77d2cee3421166d36d22d9b045eb7927a1a (diff)
fix composer bin paths
Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r--.drone.yml4
-rw-r--r--.gitignore2
-rw-r--r--tests/bootstrap.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/.drone.yml b/.drone.yml
index 417182df..986d1c41 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,12 +27,12 @@ steps:
image: nextcloudci/php7.2:php7.2-9
commands:
- composer install
- - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+ - ./composer/bin/parallel-lint --exclude ./composer/ .
- name: syntax-php7.3
image: nextcloudci/php7.3:php7.3-5
commands:
- composer install
- - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+ - ./composer/bin/parallel-lint --exclude ./composer/ .
trigger:
branch:
- master
diff --git a/.gitignore b/.gitignore
index ba525aaa..3bc6f2af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ js/
node_modules/
vendor/
img/twemoji/
-vendor/
+composer/
cypress/screenshots
cypress/snapshots
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0db0e40a..bf2dc153 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,7 @@
<?php
require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/../composer/autoload.php';
OC_App::loadApp('social');
OC_Hook::clear();