diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2020-10-08 22:03:35 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 22:03:35 -0100 |
| commit | b1be4d0437e048bdc8dbdffb696ddf98c242e969 (patch) | |
| tree | 69374d3f7d720feb5dae15ec205a4a403ddf2d95 | |
| parent | 7bc99adf214dd00110b60f579d3ac452bcf6740b (diff) | |
| parent | 67ff7c85a2bd3c9dbba41785715648b69b11e1df (diff) | |
Merge pull request #1042 from nextcloud/tests/bumb-drone-server-branch
ci fixes
| -rw-r--r-- | .drone.yml | 39 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | tests/bootstrap.php | 2 |
4 files changed, 20 insertions, 25 deletions
@@ -2,10 +2,10 @@ kind: pipeline name: compatibility steps: - name: compatibility - image: nextcloudci/php7.1:php7.1-15 + image: nextcloudci/php7.3:php7.3-5 environment: APP_NAME: social - CORE_BRANCH: stable17 + CORE_BRANCH: stable20 DB: sqlite commands: - composer install @@ -23,21 +23,16 @@ trigger: kind: pipeline name: syntax steps: - - name: syntax-php7.1 - image: nextcloudci/php7.1:php7.1-15 - commands: - - composer install - - ./vendor/bin/parallel-lint --exclude ./vendor/ . - name: syntax-php7.2 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-2 + 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 @@ -46,13 +41,13 @@ trigger: - push --- kind: pipeline -name: php7.1-sqlite +name: php7.3-sqlite steps: -- name: php7.1 - image: nextcloudci/php7.1:php7.1-16 +- name: php7.3 + image: nextcloudci/php7.3:php7.3-5 environment: APP_NAME: social - CORE_BRANCH: stable17 + CORE_BRANCH: stable20 DB: sqlite commands: - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB @@ -67,13 +62,13 @@ trigger: - push --- kind: pipeline -name: php7.1-mysql +name: php7.3-mysql steps: -- name: php7.1 - image: nextcloudci/php7.1:php7.1-16 +- name: php7.3 + image: nextcloudci/php7.3:php7.3-5 environment: APP_NAME: social - CORE_BRANCH: stable17 + CORE_BRANCH: stable20 DB: mysql commands: - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB @@ -97,13 +92,13 @@ trigger: - push --- kind: pipeline -name: php7.1-postgres +name: php7.3-postgres steps: -- name: php7.1 - image: nextcloudci/php7.1:php7.1-16 +- name: php7.3 + image: nextcloudci/php7.3:php7.3-5 environment: APP_NAME: social - CORE_BRANCH: stable17 + CORE_BRANCH: stable20 DB: postgres commands: - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB @@ -3,7 +3,7 @@ js/ node_modules/ vendor/ img/twemoji/ -vendor/ +composer/ cypress/screenshots cypress/snapshots diff --git a/composer.json b/composer.json index 7c3c5a10..a2b5143e 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ } }, "require": { - "daita/my-small-php-tools": "dev-master", + "daita/my-small-php-tools": "dev-master#ca9c257dd640576c072cb50282e15ae51147cfc2", "gumlet/php-image-resize": "2.0.*", "friendica/json-ld": "^1.0" }, 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(); |