From 434c2b57462c1ff4f26258b1558825dad279c02c Mon Sep 17 00:00:00 2001
From: Jeroen De Dauw <jeroendedauw@gmail.com>
Date: Thu, 28 Nov 2024 22:31:29 +0100
Subject: [PATCH] Fix WB submodules and test with modern MW

---
 .github/workflows/ci.yml              | 30 +++++++++++++--------------
 .github/workflows/installMediaWiki.sh |  6 ++++++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2572f25..b31d8ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,12 @@ jobs:
             php: '8.2'
           - mw: 'REL1_40'
             php: '8.2'
+          - mw: 'REL1_41'
+            php: '8.2'
+          - mw: 'REL1_42'
+            php: '8.2'
+          - mw: 'REL1_43'
+            php: '8.2'
 
     runs-on: ubuntu-latest
 
@@ -46,7 +52,7 @@ jobs:
             mediawiki
             !mediawiki/extensions/
             !mediawiki/vendor/
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v4
 
       - name: Cache Composer cache
         uses: actions/cache@v4
@@ -96,10 +102,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_37'
-            php: '8.0'
-          - mw: 'REL1_38'
-            php: '8.1'
+          - mw: 'REL1_39'
+            php: '8.2'
 
     runs-on: ubuntu-latest
 
@@ -123,7 +127,7 @@ jobs:
             mediawiki
             mediawiki/extensions/
             mediawiki/vendor/
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v4
 
       - name: Cache Composer cache
         uses: actions/cache@v4
@@ -164,10 +168,8 @@ jobs:
       strategy:
         matrix:
           include:
-            - mw: 'REL1_37'
-              php: '8.0'
-            - mw: 'REL1_38'
-              php: '8.1'
+            - mw: 'REL1_39'
+              php: '8.2'
 
       runs-on: ubuntu-latest
 
@@ -191,7 +193,7 @@ jobs:
                     mediawiki
                     mediawiki/extensions/
                     mediawiki/vendor/
-                key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+                key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v4
 
           - name: Cache Composer cache
             uses: actions/cache@v4
@@ -232,10 +234,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - mw: 'REL1_37'
-            php: '8.0'
-          - mw: 'REL1_38'
-            php: '8.1'
           - mw: 'REL1_39'
             php: '8.2'
 
@@ -267,7 +265,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.composer/cache
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v3
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}_v4
 
       - name: Install MediaWiki
         if: steps.cache-mediawiki.outputs.cache-hit != 'true'
diff --git a/.github/workflows/installMediaWiki.sh b/.github/workflows/installMediaWiki.sh
index d392562..85c8367 100644
--- a/.github/workflows/installMediaWiki.sh
+++ b/.github/workflows/installMediaWiki.sh
@@ -41,3 +41,9 @@ 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 ..