Fixes CI (#111)

* Fix CI * Update ci.yml * Update ci.yml * Update Makefile * Update composer.json * Update extension.json * Update ci.yml
SemanticMediaWiki · Dec 28, 2024 · fd40894 · fd40894
1 parent 1dd4755
commit fd40894
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,40 +11,30 @@ jobs:
 
   test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental }}
 
     strategy:
       matrix:
         include:
-          - mediawiki_version: '1.35'
-            smw_version: '4.1.2'
-            php_version: 7.4
-            database_type: mysql
-            database_image: "mysql:5.7"
-            coverage: true
-            experimental: false
-          - mediawiki_version: '1.35'
-            smw_version: dev-master
-            php_version: 7.4
+          - mediawiki_version: '1.39'
+            php_version: 8.1
             database_type: mysql
-            database_image: "mysql:5.7"
+            database_image: "mariadb:11.2"
             coverage: false
             experimental: false
           - mediawiki_version: '1.39'
-            smw_version: dev-master
             php_version: 8.1
             database_type: mysql
-            database_image: "mariadb:latest"
+            database_image: "mysql:8"
             coverage: false
             experimental: false
           - mediawiki_version: '1.40'
-            smw_version: 'dev-master'
             php_version: 8.1
             database_type: mysql
-            database_image: "mariadb:latest"
-            coverage: false
-            experimental: true
+            database_image: "mariadb:11.2"
+            coverage: true
+            experimental: false
 
 
     env:
@@ -73,7 +63,8 @@ jobs:
         if: matrix.coverage == true
 
       - name: Upload code coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/php/coverage.xml
         if: matrix.coverage == true
diff --git a/Makefile b/Makefile
@@ -11,13 +11,13 @@ endif
 EXTENSION=Mermaid
 
 # docker images
-MW_VERSION?=1.35
-PHP_VERSION?=7.4
-DB_TYPE?=sqlite
-DB_IMAGE?=""
+MW_VERSION?=1.39
+PHP_VERSION?=8.1
+DB_TYPE?=mysql
+DB_IMAGE?="mariadb:11.2"
 
 # extensions
-SMW_VERSION?=4.1.2
+SMW_VERSION?=4.2.0
 
 # composer
 # Enables "composer update" inside of extension

diff --git a/composer.json b/composer.json
@@ -20,14 +20,20 @@
 		}
 	],
 	"require": {
-		"php": ">=7.0.0",
-		"composer/installers": "1.*,>=1.0.1"
+		"php": ">=7.4",
+		"composer/installers": "^2.2.0|^1.0.1"
 	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "3.x-dev"
 		}
 	},
+	"config": {
+		"process-timeout": 0,
+		"allow-plugins": {
+			"composer/installers": true
+		}
+	},
 	"scripts":{
 		"test": [
 			"@phpunit"

diff --git a/extension.json b/extension.json
@@ -10,7 +10,7 @@
 	"license-name": "GPL-2.0-or-later",
 	"type": "parserhook",
 	"requires": {
-		"MediaWiki": ">= 1.33"
+		"MediaWiki": ">= 1.39"
 	},
 	"ExtensionMessagesFiles": {
 		"MermaidMagic": "i18n/extra/Mermaid.magic.php"