Skip to content

Commit fd40894

Browse files
authored
Fixes CI (#111)
* Fix CI * Update ci.yml * Update ci.yml * Update Makefile * Update composer.json * Update extension.json * Update ci.yml
1 parent 1dd4755 commit fd40894

File tree

4 files changed

+24
-27
lines changed

4 files changed

+24
-27
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,30 @@ jobs:
1111

1212
test:
1313

14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
continue-on-error: ${{ matrix.experimental }}
1616

1717
strategy:
1818
matrix:
1919
include:
20-
- mediawiki_version: '1.35'
21-
smw_version: '4.1.2'
22-
php_version: 7.4
23-
database_type: mysql
24-
database_image: "mysql:5.7"
25-
coverage: true
26-
experimental: false
27-
- mediawiki_version: '1.35'
28-
smw_version: dev-master
29-
php_version: 7.4
20+
- mediawiki_version: '1.39'
21+
php_version: 8.1
3022
database_type: mysql
31-
database_image: "mysql:5.7"
23+
database_image: "mariadb:11.2"
3224
coverage: false
3325
experimental: false
3426
- mediawiki_version: '1.39'
35-
smw_version: dev-master
3627
php_version: 8.1
3728
database_type: mysql
38-
database_image: "mariadb:latest"
29+
database_image: "mysql:8"
3930
coverage: false
4031
experimental: false
4132
- mediawiki_version: '1.40'
42-
smw_version: 'dev-master'
4333
php_version: 8.1
4434
database_type: mysql
45-
database_image: "mariadb:latest"
46-
coverage: false
47-
experimental: true
35+
database_image: "mariadb:11.2"
36+
coverage: true
37+
experimental: false
4838

4939

5040
env:
@@ -73,7 +63,8 @@ jobs:
7363
if: matrix.coverage == true
7464

7565
- name: Upload code coverage
76-
uses: codecov/codecov-action@v3
66+
uses: codecov/codecov-action@v4
7767
with:
68+
token: ${{ secrets.CODECOV_TOKEN }}
7869
files: coverage/php/coverage.xml
7970
if: matrix.coverage == true

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ endif
1111
EXTENSION=Mermaid
1212

1313
# docker images
14-
MW_VERSION?=1.35
15-
PHP_VERSION?=7.4
16-
DB_TYPE?=sqlite
17-
DB_IMAGE?=""
14+
MW_VERSION?=1.39
15+
PHP_VERSION?=8.1
16+
DB_TYPE?=mysql
17+
DB_IMAGE?="mariadb:11.2"
1818

1919
# extensions
20-
SMW_VERSION?=4.1.2
20+
SMW_VERSION?=4.2.0
2121

2222
# composer
2323
# Enables "composer update" inside of extension

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,20 @@
2020
}
2121
],
2222
"require": {
23-
"php": ">=7.0.0",
24-
"composer/installers": "1.*,>=1.0.1"
23+
"php": ">=7.4",
24+
"composer/installers": "^2.2.0|^1.0.1"
2525
},
2626
"extra": {
2727
"branch-alias": {
2828
"dev-master": "3.x-dev"
2929
}
3030
},
31+
"config": {
32+
"process-timeout": 0,
33+
"allow-plugins": {
34+
"composer/installers": true
35+
}
36+
},
3137
"scripts":{
3238
"test": [
3339
"@phpunit"

extension.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license-name": "GPL-2.0-or-later",
1111
"type": "parserhook",
1212
"requires": {
13-
"MediaWiki": ">= 1.33"
13+
"MediaWiki": ">= 1.39"
1414
},
1515
"ExtensionMessagesFiles": {
1616
"MermaidMagic": "i18n/extra/Mermaid.magic.php"

0 commit comments

Comments
 (0)