Skip to content

Commit

Permalink
Update .drone.star for 'drop PHP 7.2 support'
Browse files Browse the repository at this point in the history
  • Loading branch information
phil-davis committed Sep 7, 2021
1 parent 797cdb6 commit 2ee90cb
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 31 deletions.
38 changes: 14 additions & 24 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,16 @@ config = {
"branches": [
"master",
],
"codestyle": {
"ordinary": {
"phpVersions": [
"7.2",
"7.3",
"7.4",
],
},
},
"codestyle": True,
"javascript": True,
"phpunit": {
"allDatabases": {
"phpVersions": [
"7.2",
"7.3",
],
},
"reducedDatabases": {
"phpVersions": [
"7.3",
"7.4",
],
"databases": [
Expand All @@ -44,12 +35,11 @@ config = {
"phpintegration": {
"allDatabases": {
"phpVersions": [
"7.2",
"7.3",
],
},
"reducedDatabases": {
"phpVersions": [
"7.3",
"7.4",
],
"databases": [
Expand Down Expand Up @@ -144,7 +134,7 @@ def codestyle(ctx):
return pipelines

default = {
"phpVersions": ["7.2"],
"phpVersions": ["7.3"],
}

if "defaults" in config:
Expand Down Expand Up @@ -309,7 +299,7 @@ def phpstan(ctx):
return pipelines

default = {
"phpVersions": ["7.2"],
"phpVersions": ["7.3"],
"logLevel": "2",
"extraApps": {},
"enableApp": True,
Expand Down Expand Up @@ -386,7 +376,7 @@ def phan(ctx):
return pipelines

default = {
"phpVersions": ["7.2", "7.3", "7.4"],
"phpVersions": ["7.3", "7.4"],
}

if "defaults" in config:
Expand Down Expand Up @@ -457,7 +447,7 @@ def build(ctx):
return pipelines

default = {
"phpVersions": ["7.2"],
"phpVersions": ["7.3"],
"commands": [
"make dist",
],
Expand Down Expand Up @@ -656,7 +646,7 @@ def phpTests(ctx, testType, withCoverage):
errorFound = False

default = {
"phpVersions": ["7.2", "7.3", "7.4"],
"phpVersions": ["7.3", "7.4"],
"databases": [
"sqlite",
"mariadb:10.2",
Expand Down Expand Up @@ -853,7 +843,7 @@ def acceptance(ctx):
default = {
"servers": ["daily-master-qa", "latest"],
"browsers": ["chrome"],
"phpVersions": ["7.2"],
"phpVersions": ["7.4"],
"databases": ["mariadb:10.2"],
"esVersions": ["none"],
"federatedServerNeeded": False,
Expand Down Expand Up @@ -934,7 +924,7 @@ def acceptance(ctx):
params["extraSetup"] = [
{
"name": "configure-app",
"image": "owncloudci/php:7.2",
"image": "owncloudci/php:7.4",
"pull": "always",
"commands": [
"cd /var/www/owncloud/server/apps/files_primary_s3",
Expand Down Expand Up @@ -1698,7 +1688,7 @@ def setupCeph(serviceParams):

return [{
"name": "setup-ceph",
"image": "owncloudci/php:7.2",
"image": "owncloudci/php:7.4",
"pull": "always",
"commands": setupCommands + ([
"./apps/files_primary_s3/tests/drone/create-bucket.sh",
Expand Down Expand Up @@ -1726,7 +1716,7 @@ def setupScality(serviceParams):

return [{
"name": "setup-scality",
"image": "owncloudci/php:7.2",
"image": "owncloudci/php:7.4",
"pull": "always",
"commands": setupCommands + ([
"php occ s3:create-bucket owncloud --accept-warning",
Expand All @@ -1741,7 +1731,7 @@ def setupElasticSearch(esVersion):

return [{
"name": "setup-es",
"image": "owncloudci/php:7.2",
"image": "owncloudci/php:7.4",
"pull": "always",
"commands": [
"cd %s" % dir["server"],
Expand Down Expand Up @@ -2031,7 +2021,7 @@ def installNPM():
def lintTest():
return [{
"name": "lint-test",
"image": "owncloudci/php:7.2",
"image": "owncloudci/php:7.4",
"pull": "always",
"commands": [
"make test-lint",
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "owncloud/notes",
"config" : {
"platform": {
"php": "7.1"
"php": "7.3"
}
},
"require": {
"php": ">=7.1"
"php": ">=7.3"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4"
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH}
sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY}

# Properties specific to language plugins:
sonar.php.coverage.reportPaths=results/clover-phpunit-php7.2-mariadb10.2.xml,results/clover-phpunit-php7.2-mysql8.0.xml,results/clover-phpunit-php7.2-postgres9.4.xml,results/clover-phpunit-php7.2-oracle.xml,results/clover-phpunit-php7.2-sqlite.xml,results/clover-phpintegration-php7.2-mariadb10.2.xml,results/clover-phpintegration-php7.2-mysql8.0.xml,results/clover-phpintegration-php7.2-postgres9.4.xml,results/clover-phpintegration-php7.2-oracle.xml,results/clover-phpintegration-php7.2-sqlite.xml
sonar.php.coverage.reportPaths=results/clover-phpunit-php7.3-mariadb10.2.xml,results/clover-phpunit-php7.3-mysql8.0.xml,results/clover-phpunit-php7.3-postgres9.4.xml,results/clover-phpunit-php7.3-oracle.xml,results/clover-phpunit-php7.3-sqlite.xml,results/clover-phpintegration-php7.3-mariadb10.2.xml,results/clover-phpintegration-php7.3-mysql8.0.xml,results/clover-phpintegration-php7.3-postgres9.4.xml,results/clover-phpintegration-php7.3-oracle.xml,results/clover-phpintegration-php7.3-sqlite.xml
sonar.javascript.lcov.reportPaths=results/lcov.info

0 comments on commit 2ee90cb

Please sign in to comment.