From 1db6a9ca1eccd06bbdd408d6f0504c4a42448774 Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Thu, 28 Nov 2024 22:33:32 +0100 Subject: [PATCH 1/2] Fix WB submodules and test with modern MW --- .github/workflows/ci.yml | 10 +++++++++- .github/workflows/installMediaWiki.sh | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31df250..1c3264b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,14 @@ jobs: php: 8.0 - mw: 'REL1_39' php: 8.0 + - mw: 'REL1_40' + php: 8.1 + - mw: 'REL1_41' + php: 8.1 + - mw: 'REL1_42' + php: 8.2 + - mw: 'REL1_43' + php: 8.2 runs-on: ubuntu-latest @@ -46,7 +54,7 @@ jobs: mediawiki !mediawiki/extensions/ !mediawiki/vendor/ - key: mw_${{ matrix.mw }}-php${{ matrix.php }}-v1 + key: mw_${{ matrix.mw }}-php${{ matrix.php }}-v3 - name: Cache Composer cache uses: actions/cache@v2 diff --git a/.github/workflows/installMediaWiki.sh b/.github/workflows/installMediaWiki.sh index deae7f7..7bcb47c 100644 --- a/.github/workflows/installMediaWiki.sh +++ b/.github/workflows/installMediaWiki.sh @@ -46,3 +46,10 @@ EOT cd extensions git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --branch=$MW_BRANCH --recurse-submodules -j8 + +cd Wikibase +git submodule set-url view/lib/wikibase-serialization https://github.com/wmde/WikibaseSerializationJavaScript.git +git submodule set-url view/lib/wikibase-data-values https://github.com/wmde/DataValuesJavaScript.git +git submodule set-url view/lib/wikibase-data-model https://github.com/wmde/WikibaseDataModelJavaScript.git +git submodule sync && git submodule init && git submodule update --recursive +cd .. From 2e3ae5ec88138ff0f60f9ad16a42932a07974bdd Mon Sep 17 00:00:00 2001 From: Morne Alberts Date: Fri, 29 Nov 2024 00:17:39 +0200 Subject: [PATCH 2/2] Update installMediaWiki.sh --- .github/workflows/installMediaWiki.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installMediaWiki.sh b/.github/workflows/installMediaWiki.sh index 7bcb47c..67c0da0 100644 --- a/.github/workflows/installMediaWiki.sh +++ b/.github/workflows/installMediaWiki.sh @@ -1,9 +1,11 @@ #! /bin/bash +set -e + MW_BRANCH=$1 EXTENSION_NAME=$2 -wget https://github.com/wikimedia/mediawiki/archive/$MW_BRANCH.tar.gz -nv +wget https://github.com/wikimedia/mediawiki/archive/refs/heads/$MW_BRANCH.tar.gz -nv tar -zxf $MW_BRANCH.tar.gz mv mediawiki-$MW_BRANCH mediawiki @@ -45,7 +47,7 @@ cat <> composer.local.json EOT cd extensions -git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --branch=$MW_BRANCH --recurse-submodules -j8 +git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --branch=$MW_BRANCH -j8 cd Wikibase git submodule set-url view/lib/wikibase-serialization https://github.com/wmde/WikibaseSerializationJavaScript.git