diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 680c8d6..db6d484 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - mw: 'REL1_45' php: 8.3 experimental: false - - mw: 'master' + - mw: 'REL1_46' php: 8.4 experimental: true - mw: 'master' @@ -53,7 +53,7 @@ jobs: mediawiki !mediawiki/extensions/ !mediawiki/vendor/ - key: mw_${{ matrix.mw }}-php${{ matrix.php }} + key: mw_${{ matrix.mw }}-php${{ matrix.php }}-v2 - name: Cache Composer cache uses: actions/cache@v4 @@ -78,7 +78,14 @@ jobs: run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader - name: Run PHPUnit - run: php tests/phpunit/phpunit.php -c vendor/mediawiki/scss + run: | + if [ -f tests/phpunit/phpunit.php ]; then + php tests/phpunit/phpunit.php -c vendor/mediawiki/scss + else + # MW 1.46 and later + composer phpunit:config + vendor/bin/phpunit vendor/mediawiki/scss/tests/phpunit + fi code-style: name: "Code style: MW ${{ matrix.mw }}, PHP ${{ matrix.php }}" @@ -137,7 +144,7 @@ jobs: mediawiki !mediawiki/extensions/ !mediawiki/vendor/ - key: mw_${{ matrix.mw }}-php${{ matrix.php }} + key: mw_${{ matrix.mw }}-php${{ matrix.php }}-v2 - name: Cache Composer cache uses: actions/cache@v4 @@ -198,7 +205,7 @@ jobs: mediawiki !mediawiki/extensions/ !mediawiki/vendor/ - key: mw_${{ matrix.mw }}-php${{ matrix.php }} + key: mw_${{ matrix.mw }}-php${{ matrix.php }}-v2 - name: Cache Composer cache uses: actions/cache@v4 diff --git a/.github/workflows/installWiki.sh b/.github/workflows/installWiki.sh index c69cc4d..593f76c 100644 --- a/.github/workflows/installWiki.sh +++ b/.github/workflows/installWiki.sh @@ -3,10 +3,7 @@ MW_BRANCH=$1 EXTENSION_NAME=$2 -wget https://github.com/wikimedia/mediawiki/archive/$MW_BRANCH.tar.gz -nv - -tar -zxf $MW_BRANCH.tar.gz -mv mediawiki-$MW_BRANCH mediawiki +git clone --depth 1 --branch ${MW_BRANCH} https://github.com/wikimedia/mediawiki.git mediawiki cd mediawiki