diff --git a/.drone.star b/.drone.star index 7368b71..e7d2678 100644 --- a/.drone.star +++ b/.drone.star @@ -18,12 +18,11 @@ config = { 'phpunit': { 'allDatabases' : { 'phpVersions': [ - '7.1', + '7.2', ] }, 'reducedDatabases' : { 'phpVersions': [ - '7.2', '7.3', ], 'databases': [ @@ -76,7 +75,7 @@ def codestyle(): return pipelines default = { - 'phpVersions': ['7.1'], + 'phpVersions': ['7.2'], } if 'defaults' in config: @@ -265,7 +264,7 @@ def phan(): return pipelines default = { - 'phpVersions': ['7.1', '7.2', '7.3'], + 'phpVersions': ['7.2', '7.3'], } if 'defaults' in config: @@ -337,7 +336,7 @@ def build(): return pipelines default = { - 'phpVersions': ['7.1'], + 'phpVersions': ['7.2'], 'commands': [ 'make dist' ], @@ -432,6 +431,7 @@ def javascript(): 'extraServices': [], 'extraEnvironment': {}, 'extraCommandsBeforeTestRun': [], + 'extraTeardown': [], } if 'defaults' in config: @@ -462,20 +462,20 @@ def javascript(): }, 'steps': installCore('daily-master-qa', 'sqlite', False) + - installApp('7.1') + - setupServerAndApp('7.1', params['logLevel']) + + installApp('7.2') + + setupServerAndApp('7.2', params['logLevel']) + params['extraSetup'] + [ { 'name': 'js-tests', - 'image': 'owncloudci/php:7.1', + 'image': 'owncloudci/php:7.2', 'pull': 'always', 'environment': params['extraEnvironment'], 'commands': params['extraCommandsBeforeTestRun'] + [ 'make test-js' ] } - ], + ] + params['extraTeardown'], 'services': params['extraServices'], 'depends_on': [], 'trigger': { @@ -515,7 +515,7 @@ def phptests(testType): errorFound = False default = { - 'phpVersions': ['7.1', '7.2', '7.3'], + 'phpVersions': ['7.2', '7.3'], 'databases': [ 'sqlite', 'mariadb:10.2', 'mysql:5.5', 'mysql:5.7', 'postgres:9.4', 'oracle' ], @@ -529,6 +529,7 @@ def phptests(testType): 'extraEnvironment': {}, 'extraCommandsBeforeTestRun': [], 'extraApps': {}, + 'extraTeardown': [], } if 'defaults' in config: @@ -627,7 +628,7 @@ def phptests(testType): command ] } - ], + ] + params['extraTeardown'], 'services': databaseService(db) + cephService(params['cephS3']) + @@ -682,7 +683,7 @@ def acceptance(): default = { 'servers': ['daily-master-qa', 'latest'], 'browsers': ['chrome'], - 'phpVersions': ['7.1'], + 'phpVersions': ['7.2'], 'databases': ['mariadb:10.2'], 'federatedServerNeeded': False, 'filterTags': '', @@ -695,6 +696,7 @@ def acceptance(): 'xForwardedFor': False, 'extraSetup': [], 'extraServices': [], + 'extraTeardown': [], 'extraEnvironment': {}, 'extraCommandsBeforeTestRun': [], 'extraApps': {}, @@ -855,7 +857,7 @@ def acceptance(): 'make %s' % makeParameter ] }), - ], + ] + params['extraTeardown'], 'services': databaseService(db) + browserService(browser) + @@ -1103,16 +1105,18 @@ def getDbName(db): def getDbUsername(db): name = getDbName(db) + # The Oracle image has the Db Username hardcoded if name == 'oracle': - return 'system' + return 'autotest' return 'owncloud' def getDbPassword(db): name = getDbName(db) + # The Oracle image has the Db Password hardcoded if name == 'oracle': - return 'oracle' + return 'owncloud' return 'owncloud' @@ -1122,6 +1126,7 @@ def getDbRootPassword(): def getDbDatabase(db): name = getDbName(db) + # The Oracle image has the Db Name hardcoded if name == 'oracle': return 'XE' @@ -1249,7 +1254,7 @@ def setupCeph(serviceParams): return [{ 'name': 'setup-ceph', - 'image': 'owncloudci/php:7.1', + 'image': 'owncloudci/php:7.2', 'pull': 'always', 'commands': setupCommands + ([ './apps/files_primary_s3/tests/drone/create-bucket.sh', @@ -1277,7 +1282,7 @@ def setupScality(serviceParams): return [{ 'name': 'setup-scality', - 'image': 'owncloudci/php:7.1', + 'image': 'owncloudci/php:7.2', 'pull': 'always', 'commands': setupCommands + ([ 'php occ s3:create-bucket owncloud --accept-warning' diff --git a/composer.json b/composer.json index 38bd79c..8ab83a2 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "require": { }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2" + "bamarni/composer-bin-plugin": "^1.4" }, "extra": { "bamarni-bin": { diff --git a/composer.lock b/composer.lock index c4f16bb..883740f 100644 --- a/composer.lock +++ b/composer.lock @@ -1,39 +1,37 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "4f4c7ab11c79e643f799fc66dae12148", + "content-hash": "625b2761d5b21ecf26f65000d1a1b1f9", "packages": [], "packages-dev": [ { "name": "bamarni/composer-bin-plugin", - "version": "v1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/bamarni/composer-bin-plugin.git", - "reference": "67f9d314dc7ecf7245b8637906e151ccc62b8d24" + "reference": "46cb272590cc6b7f5947655063a7fd6ea097838b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/67f9d314dc7ecf7245b8637906e151ccc62b8d24", - "reference": "67f9d314dc7ecf7245b8637906e151ccc62b8d24", + "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/46cb272590cc6b7f5947655063a7fd6ea097838b", + "reference": "46cb272590cc6b7f5947655063a7fd6ea097838b", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0" + "composer-plugin-api": "^1.0 || ^2.0", + "php": "^5.6 || ^7.0 || ^8.0" }, "require-dev": { - "composer/composer": "dev-master", + "composer/composer": "^1.0 || ^2.0", "symfony/console": "^2.5 || ^3.0 || ^4.0" }, "type": "composer-plugin", "extra": { - "class": "Bamarni\\Composer\\Bin\\Plugin", - "branch-alias": { - "dev-master": "1.1-dev" - } + "class": "Bamarni\\Composer\\Bin\\Plugin" }, "autoload": { "psr-4": { @@ -44,7 +42,16 @@ "license": [ "MIT" ], - "time": "2019-03-17T12:38:04+00:00" + "description": "No conflicts for your bin dependencies", + "keywords": [ + "composer", + "conflict", + "dependency", + "executable", + "isolation", + "tool" + ], + "time": "2020-04-17T09:33:47+00:00" } ], "aliases": [],