From ca96bd44f84c3dec6fcfc52e633aaf036fb7d509 Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Mon, 11 Jul 2022 18:20:02 +0545 Subject: [PATCH] Allow plugin bamarni/composer-bin-plugin --- .drone.env | 2 +- .drone.star | 6 ++++++ composer.json | 5 ++++- tests/acceptance/expected-failures-on-OCIS-storage.md | 2 -- tests/acceptance/expected-failures-on-S3NG-storage.md | 2 -- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.drone.env b/.drone.env index fde4ae50db..f206055d8a 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for API tests -CORE_COMMITID=f1e0bf08b898c7300d4b294c8371f4025d9d99b8 +CORE_COMMITID=9e61886b31671be8cea1f43809bb1a5a826e543c CORE_BRANCH=master diff --git a/.drone.star b/.drone.star index cc5e50c98e..ce7acf1196 100644 --- a/.drone.star +++ b/.drone.star @@ -569,6 +569,8 @@ def virtualViews(): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src", + "composer self-update", + "composer --version", "make test-acceptance-api", ], "environment": { @@ -920,6 +922,8 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src/tmp/testrunner", + "composer self-update", + "composer --version", "make test-acceptance-api", ], "environment": { @@ -997,6 +1001,8 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src/tmp/testrunner", + "composer self-update", + "composer --version", "make test-acceptance-api", ], "environment": { diff --git a/composer.json b/composer.json index 9de39b38ec..05a282bed1 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,10 @@ "platform": { "php": "7.4" }, - "vendor-dir": "./vendor-php" + "vendor-dir": "./vendor-php", + "allow-plugins": { + "bamarni/composer-bin-plugin": true + } }, "require": { }, diff --git a/tests/acceptance/expected-failures-on-OCIS-storage.md b/tests/acceptance/expected-failures-on-OCIS-storage.md index 1f361564c9..e987e98c8c 100644 --- a/tests/acceptance/expected-failures-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-on-OCIS-storage.md @@ -929,8 +929,6 @@ _ocdav: api compatibility, return correct status code_ - [apiWebdavEtagPropagation1/deleteFileFolder.feature:156](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature#L156) - [apiWebdavEtagPropagation1/deleteFileFolder.feature:194](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature#L194) - [apiWebdavEtagPropagation1/deleteFileFolder.feature:232](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature#L232) -- [apiWebdavEtagPropagation2/copyFileFolder.feature:194](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/copyFileFolder.feature#L194) -- [apiWebdavEtagPropagation2/copyFileFolder.feature:238](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/copyFileFolder.feature#L238) - [apiWebdavEtagPropagation2/createFolder.feature:85](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/createFolder.feature#L85) - [apiWebdavEtagPropagation2/createFolder.feature:116](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/createFolder.feature#L116) - [apiWebdavEtagPropagation2/upload.feature:83](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/upload.feature#L83) diff --git a/tests/acceptance/expected-failures-on-S3NG-storage.md b/tests/acceptance/expected-failures-on-S3NG-storage.md index 6b53ac9c6b..aac6699c31 100644 --- a/tests/acceptance/expected-failures-on-S3NG-storage.md +++ b/tests/acceptance/expected-failures-on-S3NG-storage.md @@ -940,8 +940,6 @@ And other missing implementation of favorites - [apiWebdavEtagPropagation1/deleteFileFolder.feature:156](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature#L156) - [apiWebdavEtagPropagation1/deleteFileFolder.feature:194](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature#L194) - [apiWebdavEtagPropagation1/deleteFileFolder.feature:232](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature#L232) -- [apiWebdavEtagPropagation2/copyFileFolder.feature:194](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/copyFileFolder.feature#L194) -- [apiWebdavEtagPropagation2/copyFileFolder.feature:238](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/copyFileFolder.feature#L238) - [apiWebdavEtagPropagation2/createFolder.feature:85](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/createFolder.feature#L85) - [apiWebdavEtagPropagation2/createFolder.feature:116](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/createFolder.feature#L116) - [apiWebdavEtagPropagation2/upload.feature:83](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/upload.feature#L83)