From c7071e72dac908287423d2453af6eba81a58fe7b Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 2 Nov 2020 16:19:37 +0545 Subject: [PATCH] Adjust PHP dependencies for composer 2.0 --- .drone.star | 6 +++--- ocis/vendor-bin/behat/composer.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 0309d0d23a..01cfb2c9e4 100644 --- a/.drone.star +++ b/.drone.star @@ -352,7 +352,7 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo cloneCoreRepos(coreBranch, coreCommit) + [ { 'name': 'localApiTests-%s-storage' % (storage), - 'image': 'owncloudci/php:7.2', + 'image': 'owncloudci/php:7.4', 'pull': 'always', 'environment' : { 'TEST_SERVER_URL': 'https://ocis-server:9200', @@ -407,7 +407,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n cloneCoreRepos(coreBranch, coreCommit) + [ { 'name': 'oC10ApiTests-%s-storage-%s' % (storage, part_number), - 'image': 'owncloudci/php:7.2', + 'image': 'owncloudci/php:7.4', 'pull': 'always', 'environment' : { 'TEST_SERVER_URL': 'https://ocis-server:9200', @@ -1430,7 +1430,7 @@ def cloneCoreRepos(coreBranch, coreCommit): return [ { 'name': 'clone-core-repos', - 'image': 'owncloudci/php:7.2', + 'image': 'owncloudci/php:7.4', 'pull': 'always', 'commands': [ 'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/tmp/testing', diff --git a/ocis/vendor-bin/behat/composer.json b/ocis/vendor-bin/behat/composer.json index 807eb10a51..4b16764533 100644 --- a/ocis/vendor-bin/behat/composer.json +++ b/ocis/vendor-bin/behat/composer.json @@ -1,7 +1,7 @@ { "config" : { "platform": { - "php": "7.2" + "php": "7.4" } }, "require": {