diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4c7c25..6b77201 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,21 +17,42 @@ jobs: strategy: matrix: include: - - mediawiki_version: '1.35' - php_version: 7.4 + - mediawiki_version: '1.39' + php_version: 8.1 chameleon_version: 4.2.1 database_type: mysql - database_image: "mysql:5.7" + database_image: "mysql:8" + coverage: false + experimental: false + - mediawiki_version: '1.40' + php_version: 8.1 + chameleon_version: 4.2.1 + database_type: mysql + database_image: "mysql:8" coverage: true experimental: false - - mediawiki_version: '1.39' + - mediawiki_version: '1.41' php_version: 8.1 chameleon_version: 4.2.1 database_type: mysql database_image: "mysql:8" coverage: false experimental: false - + - mediawiki_version: '1.42' + php_version: 8.2 + chameleon_version: 4.2.1 + database_type: mysql + database_image: "mysql:8" + coverage: false + experimental: false + - mediawiki_version: '1.43' + php_version: 8.2 + chameleon_version: 4.2.1 + database_type: mysql + database_image: "mysql:8" + coverage: false + experimental: false + env: MW_VERSION: ${{ matrix.mediawiki_version }} CHAMELEON_VERSION: ${{ matrix.chameleon_version }} diff --git a/Makefile b/Makefile index a3734e7..d492abc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ --include .env-39 +-include .env export # setup for docker-compose-ci build directory @@ -11,10 +11,10 @@ endif EXTENSION := ConfIDentSkin # 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?="mysql:8" # extensions CHAMELEON_VERSION?=4.2.1 diff --git a/build b/build index d54a8ce..10d5746 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit d54a8ceaa4e6c0d12574729416eec819474307a4 +Subproject commit 10d57463ef3332f79d6b0e763ca8c5d2c4860e16 diff --git a/tests/node-qunit/setup.js b/tests/node-qunit/setup.js index 58f41e7..fd19c89 100644 --- a/tests/node-qunit/setup.js +++ b/tests/node-qunit/setup.js @@ -37,6 +37,8 @@ function createDom() { global.window = dom.window; global.document = window.document; global.Node = window.Node; + global.HTMLElement = dom.window.HTMLElement; + global.customElements = dom.window.customElements; global.$ = global.jQuery = require('../../../../resources/lib/jquery/jquery.js'); return () => {