Skip to content

Commit 3e05b12

Browse files
HackwarHackwar
authored
Drone: Fixing MSSQL, removing phpcpd & phpmd (#288)
1 parent a0fcfc1 commit 3e05b12

2 files changed

Lines changed: 16 additions & 62 deletions

File tree

‎.drone.jsonnet‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ local phpunit_sqlsrv(phpversion) = {
6060
'apt-get update',
6161
'apt-get install -y software-properties-common lsb-release gnupg',
6262
'curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -',
63-
'echo "deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/debian/11/prod bullseye main" >> /etc/apt/sources.list',
63+
'echo "deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" >> /etc/apt/sources.list',
6464
'apt-get update',
6565
'ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev',
66-
'pecl install sqlsrv && docker-php-ext-enable sqlsrv',
67-
'pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv',
66+
if phpversion < '8.0' then 'pecl install sqlsrv-5.10.1 && docker-php-ext-enable sqlsrv'
67+
else 'pecl install sqlsrv && docker-php-ext-enable sqlsrv' ,
68+
if phpversion < '8.0' then 'pecl install pdo_sqlsrv-5.10.1 && docker-php-ext-enable pdo_sqlsrv'
69+
else 'pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv',
6870
'php --ri sqlsrv',
6971
'php --ri pdo_sqlsrv',
7072
'vendor/bin/phpunit --configuration phpunit.sqlsrv.xml.dist --testdox',
@@ -227,19 +229,6 @@ local pipeline_sqlsrv(phpversion, driver, dbversion, params) = {
227229
'vendor/bin/phpcs --standard=ruleset.xml src/',
228230
],
229231
},
230-
{
231-
name: 'phpmd',
232-
image: 'joomlaprojects/docker-images:php7.4',
233-
depends: [ 'composer' ],
234-
failure: 'ignore',
235-
commands: [
236-
'vendor/bin/phpmd src text cleancode',
237-
'vendor/bin/phpmd src text codesize',
238-
'vendor/bin/phpmd src text controversial',
239-
'vendor/bin/phpmd src text design',
240-
'vendor/bin/phpmd src text unusedcode',
241-
],
242-
},
243232
{
244233
name: 'phpstan',
245234
image: 'joomlaprojects/docker-images:php7.4',
@@ -258,15 +247,6 @@ local pipeline_sqlsrv(phpversion, driver, dbversion, params) = {
258247
'phploc src',
259248
],
260249
},
261-
{
262-
name: 'phpcpd',
263-
image: 'joomlaprojects/docker-images:php7.4',
264-
depends: [ 'composer' ],
265-
failure: 'ignore',
266-
commands: [
267-
'phpcpd src',
268-
],
269-
},
270250
],
271251
},
272252
pipeline_sqlite('7.2', 'sqlite', '--prefer-stable --prefer-lowest'),

‎.drone.yml‎

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,6 @@
2929
"image": "joomlaprojects/docker-images:php7.4",
3030
"name": "phpcs"
3131
},
32-
{
33-
"commands": [
34-
"vendor/bin/phpmd src text cleancode",
35-
"vendor/bin/phpmd src text codesize",
36-
"vendor/bin/phpmd src text controversial",
37-
"vendor/bin/phpmd src text design",
38-
"vendor/bin/phpmd src text unusedcode"
39-
],
40-
"depends": [
41-
"composer"
42-
],
43-
"failure": "ignore",
44-
"image": "joomlaprojects/docker-images:php7.4",
45-
"name": "phpmd"
46-
},
4732
{
4833
"commands": [
4934
"vendor/bin/phpstan analyse src"
@@ -65,17 +50,6 @@
6550
"failure": "ignore",
6651
"image": "joomlaprojects/docker-images:php7.4",
6752
"name": "phploc"
68-
},
69-
{
70-
"commands": [
71-
"phpcpd src"
72-
],
73-
"depends": [
74-
"composer"
75-
],
76-
"failure": "ignore",
77-
"image": "joomlaprojects/docker-images:php7.4",
78-
"name": "phpcpd"
7953
}
8054
],
8155
"volumes": [
@@ -236,7 +210,7 @@
236210
{
237211
"commands": [
238212
"php --ri sqlite || true",
239-
"vendor/bin/phpunit --configuration phpunit.sqlite.xml.dist --verbose --debug"
213+
"vendor/bin/phpunit --configuration phpunit.sqlite.xml.dist --testdox"
240214
],
241215
"image": "joomlaprojects/docker-images:php8.0",
242216
"name": "PHPUnit"
@@ -2999,11 +2973,11 @@
29992973
"apt-get update",
30002974
"apt-get install -y software-properties-common lsb-release gnupg",
30012975
"curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -",
3002-
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/debian/11/prod bullseye main\" >> /etc/apt/sources.list",
2976+
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main\" >> /etc/apt/sources.list",
30032977
"apt-get update",
30042978
"ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev",
3005-
"pecl install sqlsrv && docker-php-ext-enable sqlsrv",
3006-
"pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv",
2979+
"pecl install sqlsrv-5.10.1 && docker-php-ext-enable sqlsrv",
2980+
"pecl install pdo_sqlsrv-5.10.1 && docker-php-ext-enable pdo_sqlsrv",
30072981
"php --ri sqlsrv",
30082982
"php --ri pdo_sqlsrv",
30092983
"vendor/bin/phpunit --configuration phpunit.sqlsrv.xml.dist --testdox"
@@ -3065,11 +3039,11 @@
30653039
"apt-get update",
30663040
"apt-get install -y software-properties-common lsb-release gnupg",
30673041
"curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -",
3068-
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/debian/11/prod bullseye main\" >> /etc/apt/sources.list",
3042+
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main\" >> /etc/apt/sources.list",
30693043
"apt-get update",
30703044
"ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev",
3071-
"pecl install sqlsrv && docker-php-ext-enable sqlsrv",
3072-
"pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv",
3045+
"pecl install sqlsrv-5.10.1 && docker-php-ext-enable sqlsrv",
3046+
"pecl install pdo_sqlsrv-5.10.1 && docker-php-ext-enable pdo_sqlsrv",
30733047
"php --ri sqlsrv",
30743048
"php --ri pdo_sqlsrv",
30753049
"vendor/bin/phpunit --configuration phpunit.sqlsrv.xml.dist --testdox"
@@ -3131,7 +3105,7 @@
31313105
"apt-get update",
31323106
"apt-get install -y software-properties-common lsb-release gnupg",
31333107
"curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -",
3134-
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/debian/11/prod bullseye main\" >> /etc/apt/sources.list",
3108+
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main\" >> /etc/apt/sources.list",
31353109
"apt-get update",
31363110
"ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev",
31373111
"pecl install sqlsrv && docker-php-ext-enable sqlsrv",
@@ -3197,7 +3171,7 @@
31973171
"apt-get update",
31983172
"apt-get install -y software-properties-common lsb-release gnupg",
31993173
"curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -",
3200-
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/debian/11/prod bullseye main\" >> /etc/apt/sources.list",
3174+
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main\" >> /etc/apt/sources.list",
32013175
"apt-get update",
32023176
"ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev",
32033177
"pecl install sqlsrv && docker-php-ext-enable sqlsrv",
@@ -3263,7 +3237,7 @@
32633237
"apt-get update",
32643238
"apt-get install -y software-properties-common lsb-release gnupg",
32653239
"curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -",
3266-
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/debian/11/prod bullseye main\" >> /etc/apt/sources.list",
3240+
"echo \"deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main\" >> /etc/apt/sources.list",
32673241
"apt-get update",
32683242
"ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev",
32693243
"pecl install sqlsrv && docker-php-ext-enable sqlsrv",
@@ -3287,6 +3261,6 @@
32873261
}
32883262
---
32893263
kind: signature
3290-
hmac: 302cd1e7217471caf7f0128aa7a18720c979b657b3a7c3fea2927e27c67fbb17
3264+
hmac: d6c74ff0b2582f86e054449932a847efab8008c7c50789a2ddf8884766416076
32913265

32923266
...

0 commit comments

Comments
 (0)