Skip to content

Commit 02fd63c

Browse files
Merge pull request #74 from owncloud/drop-php7.0
Drop PHP 7.0 from drone CI
2 parents 8bb1665 + 55fc87a commit 02fd63c

File tree

2 files changed

+12
-39
lines changed

2 files changed

+12
-39
lines changed

.drone.starlark

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ config = {
1212
'codestyle': {
1313
'ordinary' : {
1414
'phpVersions': [
15-
'7.0',
1615
'7.1',
1716
'7.2',
1817
'7.3',
@@ -74,7 +73,7 @@ def codestyle():
7473
return pipelines
7574

7675
default = {
77-
'phpVersions': ['7.0'],
76+
'phpVersions': ['7.1'],
7877
}
7978

8079
if 'defaults' in config:
@@ -263,7 +262,7 @@ def phan():
263262
return pipelines
264263

265264
default = {
266-
'phpVersions': ['7.0', '7.1', '7.2', '7.3'],
265+
'phpVersions': ['7.1', '7.2', '7.3'],
267266
}
268267

269268
if 'defaults' in config:
@@ -335,7 +334,7 @@ def build():
335334
return pipelines
336335

337336
default = {
338-
'phpVersions': ['7.0'],
337+
'phpVersions': ['7.1'],
339338
'commands': [
340339
'make dist'
341340
],
@@ -460,13 +459,13 @@ def javascript():
460459
},
461460
'steps':
462461
installCore('daily-master-qa', 'sqlite', False) +
463-
installApp('7.0') +
464-
setupServerAndApp('7.0', params['logLevel']) +
462+
installApp('7.1') +
463+
setupServerAndApp('7.1', params['logLevel']) +
465464
params['extraSetup'] +
466465
[
467466
{
468467
'name': 'js-tests',
469-
'image': 'owncloudci/php:7.0',
468+
'image': 'owncloudci/php:7.1',
470469
'pull': 'always',
471470
'environment': params['extraEnvironment'],
472471
'commands': params['extraCommandsBeforeTestRun'] + [
@@ -513,7 +512,7 @@ def phptests(testType):
513512
errorFound = False
514513

515514
default = {
516-
'phpVersions': ['7.0', '7.1', '7.2', '7.3'],
515+
'phpVersions': ['7.1', '7.2', '7.3'],
517516
'databases': [
518517
'sqlite', 'mariadb:10.2', 'mysql:5.5', 'mysql:5.7', 'postgres:9.4', 'oracle'
519518
],
@@ -680,7 +679,7 @@ def acceptance():
680679
default = {
681680
'servers': ['daily-master-qa', 'latest'],
682681
'browsers': ['chrome'],
683-
'phpVersions': ['7.0'],
682+
'phpVersions': ['7.1'],
684683
'databases': ['mariadb:10.2'],
685684
'federatedServerNeeded': False,
686685
'filterTags': '',
@@ -1257,15 +1256,15 @@ def setupCeph(serviceParams):
12571256

12581257
createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
12591258
setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
1260-
'wait-for-it -t 60 ceph:80',
1259+
'wait-for-it -t 120 ceph:80',
12611260
'cd /var/www/owncloud/server/apps/files_primary_s3',
12621261
'cp tests/drone/ceph.config.php /var/www/owncloud/server/config',
12631262
'cd /var/www/owncloud/server',
12641263
]
12651264

12661265
return [{
12671266
'name': 'setup-ceph',
1268-
'image': 'owncloudci/php:7.0',
1267+
'image': 'owncloudci/php:7.1',
12691268
'pull': 'always',
12701269
'commands': setupCommands + ([
12711270
'./apps/files_primary_s3/tests/drone/create-bucket.sh',
@@ -1285,15 +1284,15 @@ def setupScality(serviceParams):
12851284
createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
12861285
createExtraBuckets = serviceParams['createExtraBuckets'] if 'createExtraBuckets' in serviceParams else False
12871286
setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
1288-
'wait-for-it -t 60 scality:8000',
1287+
'wait-for-it -t 120 scality:8000',
12891288
'cd /var/www/owncloud/server/apps/files_primary_s3',
12901289
'cp tests/drone/%s /var/www/owncloud/server/config' % configFile,
12911290
'cd /var/www/owncloud/server'
12921291
]
12931292

12941293
return [{
12951294
'name': 'setup-scality',
1296-
'image': 'owncloudci/php:7.0',
1295+
'image': 'owncloudci/php:7.1',
12971296
'pull': 'always',
12981297
'commands': setupCommands + ([
12991298
'php occ s3:create-bucket owncloud --accept-warning'

.drone.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
1-
---
2-
kind: pipeline
3-
type: docker
4-
name: coding-standard-php7.0
5-
6-
platform:
7-
os: linux
8-
arch: amd64
9-
10-
workspace:
11-
base: /var/www/owncloud
12-
path: server/apps/files_external_dropbox
13-
14-
steps:
15-
- name: coding-standard
16-
pull: always
17-
image: owncloudci/php:7.0
18-
commands:
19-
- make test-php-style
20-
21-
trigger:
22-
ref:
23-
- refs/pull/**
24-
- refs/tags/**
25-
- refs/heads/master
26-
271
---
282
kind: pipeline
293
type: docker

0 commit comments

Comments
 (0)