From a5b2389c226379cd08aa2128f5057db6cc0d43bd Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Fri, 23 Feb 2024 17:58:10 +0100
Subject: [PATCH 01/11] WIP add support for patchUrls field in extension list

---
 sync/wikiman/wikiman.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sync/wikiman/wikiman.py b/sync/wikiman/wikiman.py
index dee63e183..038ebbab8 100755
--- a/sync/wikiman/wikiman.py
+++ b/sync/wikiman/wikiman.py
@@ -52,6 +52,12 @@ def make_artifact_entry(details: Dict[str, str], extra_remove: List[str]) -> Dic
         'destination': details['destination'],
         'remove' : extra_remove + details.get('remove', []),
     }
+
+    if "patchUrls" in details.keys():
+        entry['patchUrls'] = []
+        for patchUrl in details['patchUrls']:
+            entry['patchUrls'] += patchUrl
+
     return entry
 
 # pylint: disable=too-many-ancestors

From a53fa57cef699815ad10987a2ef3e7038fc94719 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Fri, 23 Feb 2024 18:27:23 +0100
Subject: [PATCH 02/11] fix patchUrl string concatenation

---
 sync/wikiman/wikiman.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync/wikiman/wikiman.py b/sync/wikiman/wikiman.py
index 038ebbab8..ea57ceb93 100755
--- a/sync/wikiman/wikiman.py
+++ b/sync/wikiman/wikiman.py
@@ -56,7 +56,7 @@ def make_artifact_entry(details: Dict[str, str], extra_remove: List[str]) -> Dic
     if "patchUrls" in details.keys():
         entry['patchUrls'] = []
         for patchUrl in details['patchUrls']:
-            entry['patchUrls'] += patchUrl
+            entry['patchUrls'].append(patchUrl)
 
     return entry
 

From 6b8f60e9376998545aa36b05d4f9a2f43f130679 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Fri, 23 Feb 2024 18:28:00 +0100
Subject: [PATCH 03/11] add patchUrls to wikiman.yaml

---
 wikiman.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/wikiman.yaml b/wikiman.yaml
index 4ca2a20f6..921b37f4e 100644
--- a/wikiman.yaml
+++ b/wikiman.yaml
@@ -48,8 +48,13 @@ extensions:
     repoName: wikimedia/mediawiki-extensions-CirrusSearch
   - name: WikibaseCirrusSearch
     repoName: wikimedia/mediawiki-extensions-WikibaseCirrusSearch
+    patchUrls:
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~908801/revisions/2/patch?download
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~951473/revisions/1/patch?download
   - name: WikibaseLexemeCirrusSearch
     repoName: wikimedia/mediawiki-extensions-WikibaseLexemeCirrusSearch
+    patchUrls:
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseLexemeCirrusSearch~908803/revisions/1/patch?download
   - name: UniversalLanguageSelector
     repoName: wikimedia/mediawiki-extensions-UniversalLanguageSelector
   - name: cldr
@@ -120,6 +125,8 @@ extensions:
     repoName: wikimedia/mediawiki-extensions-TextExtracts
   - name: EntitySchema
     repoName: wikimedia/mediawiki-extensions-EntitySchema
+    patchUrls:
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FEntitySchema~942447/revisions/2/patch?download
   ## These extensions should not currently use the mediawikiVersion
   - name: WikibaseInWikitext
     repoName: wbstack/mediawiki-extensions-WikibaseInWikitext
@@ -162,6 +169,11 @@ extensions:
       - lib/.phan
       - lib/.storybook
       - lib/.vscode
+    patchUrls:
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~833742/revisions/19/patch?download
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~940955/revisions/1/patch?download
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~943530/revisions/1/patch?download
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~951472/revisions/1/patch?download
   # It looks like StopForumSpam inadvertently introduced a dependency on AbuseFilter in REL1_39 (https://github.com/wikimedia/mediawiki-extensions-StopForumSpam/commit/3639e0120d53bf5643de57dc6e94293f69680e9f)
   # AFAIK it should be possible to run StopForumSpam without AbuseFilter installed (https://www.mediawiki.org/wiki/Extension:StopForumSpam#AbuseFilter_integration)
   # A subsequent patch, only available in REL1_40, appears to removes this dependency again (https://github.com/wikimedia/mediawiki-extensions-StopForumSpam/commit/5e3aab6e8be0e8effa97f9b454020230b6a70e3d)

From 91dd751e8e59bb3627bf5328bbdc463d80004104 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Fri, 23 Feb 2024 18:33:49 +0100
Subject: [PATCH 04/11] adjust json schema

---
 sync/wikiman/wikiman-schema.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sync/wikiman/wikiman-schema.json b/sync/wikiman/wikiman-schema.json
index cb2ac83bc..d84ecd125 100644
--- a/sync/wikiman/wikiman-schema.json
+++ b/sync/wikiman/wikiman-schema.json
@@ -66,6 +66,9 @@
         },
         "remove": {
           "$ref": "#/$defs/RemoveList"
+        },
+        "patchUrls": {
+          "$ref": "#/$defs/PatchUrlList"
         }
       },
       "additionalProperties": false,
@@ -102,6 +105,13 @@
       "items": {
         "type": "string"
       }
+    },
+    "PatchUrlList": {
+      "description": "A list of gerrit URLs pointing to a base64 encoded git patch",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
     }
   }
 }

From 6ee3637f96f0e1b63901e7ca1642636f28ce884c Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Tue, 23 Apr 2024 19:00:41 +0200
Subject: [PATCH 05/11] fix json schema

---
 sync/wikiman/wikiman-schema.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sync/wikiman/wikiman-schema.json b/sync/wikiman/wikiman-schema.json
index d84ecd125..f372d7dd9 100644
--- a/sync/wikiman/wikiman-schema.json
+++ b/sync/wikiman/wikiman-schema.json
@@ -91,6 +91,9 @@
         },
         "remove": {
           "$ref": "#/$defs/RemoveList"
+        },
+        "patchUrls": {
+          "$ref": "#/$defs/PatchUrlList"
         }
       },
       "additionalProperties": false,

From 5b4bcbc0583587273dd3ef141e16808e7b1d4b85 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Tue, 23 Apr 2024 19:05:06 +0200
Subject: [PATCH 06/11] merge with upstream

---
 wikiman.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wikiman.yaml b/wikiman.yaml
index 921b37f4e..067d3b667 100644
--- a/wikiman.yaml
+++ b/wikiman.yaml
@@ -127,6 +127,8 @@ extensions:
     repoName: wikimedia/mediawiki-extensions-EntitySchema
     patchUrls:
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FEntitySchema~942447/revisions/2/patch?download
+  - name: DismissableSiteNotice
+    repoName: wikimedia/mediawiki-extensions-DismissableSiteNotice
   ## These extensions should not currently use the mediawikiVersion
   - name: WikibaseInWikitext
     repoName: wbstack/mediawiki-extensions-WikibaseInWikitext

From 5666cd0e86adc2a8956c3f1e7bc02a93a8e06136 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Wed, 24 Apr 2024 11:25:09 +0200
Subject: [PATCH 07/11] adjust docs

---
 docs/build-scripts.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/build-scripts.md b/docs/build-scripts.md
index cb10dc631..ccb9ba9ea 100644
--- a/docs/build-scripts.md
+++ b/docs/build-scripts.md
@@ -47,5 +47,3 @@ Example:
   patchUrls:
   - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~833742/revisions/15/patch?download
 ```
-
-**please note**: currently these will get overridden if `wikiman` is used to generate the file!

From 7206c2300eff9e0cbd7e7c28c80262ce1c4ba01a Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Wed, 24 Apr 2024 11:36:06 +0200
Subject: [PATCH 08/11] python code style

---
 sync/wikiman/wikiman.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sync/wikiman/wikiman.py b/sync/wikiman/wikiman.py
index ea57ceb93..d1753072d 100755
--- a/sync/wikiman/wikiman.py
+++ b/sync/wikiman/wikiman.py
@@ -55,8 +55,8 @@ def make_artifact_entry(details: Dict[str, str], extra_remove: List[str]) -> Dic
 
     if "patchUrls" in details.keys():
         entry['patchUrls'] = []
-        for patchUrl in details['patchUrls']:
-            entry['patchUrls'].append(patchUrl)
+        for patch_url in details['patchUrls']:
+            entry['patchUrls'].append(patch_url)
 
     return entry
 

From d5855b69ae2d7b9b9cc7478a4214faeebd0afc12 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Wed, 24 Apr 2024 17:34:42 +0200
Subject: [PATCH 09/11] docs

---
 docs/build-scripts.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/build-scripts.md b/docs/build-scripts.md
index ccb9ba9ea..4d2ecbbb7 100644
--- a/docs/build-scripts.md
+++ b/docs/build-scripts.md
@@ -7,6 +7,21 @@ graph TD
     B-->|pacman|C[dist folder with things in it]
 ```
 
+### Checklist for updating mediawiki
+- `wikiman.yaml`
+  - Check `mediawikiVersion` is still set to the version we want to target e.g. 1.39
+  - Check if `mediawikiRepoRef` is set to a specific value for a reason that still makes sense
+    - If not remove it
+- Review `patchUrls`
+  - Open each patch and determine if it has now been merged into the updated version you are targeting
+    - If so: remove it
+    - If not determine if we should:
+      - Apply it as is
+      - Edit it so that is correctly applies to the newly updated code
+      - Remove it since it's no longer needed
+- Run `./sync/wikiman/wikiman .`
+- Run `./sync.sh`
+
 ### sync.sh
 
 This script will resync the `dist` directory.
@@ -39,7 +54,7 @@ This needs to be run by developers when updating component versions in `wikiman.
 This is run as a step in `sync.sh`
 
 #### Syncing patches
-To apply additional gerrit patches, you can specify patch URLs in the corresponding codebase part of `pacman.yaml`
+To apply additional gerrit patches, you can specify patch URLs in the corresponding codebase part of `wikiman.yaml`.
 
 Example:
 ```

From a4a0f2017dc71a5e04c53f9e0b5a4fdbbb019299 Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Wed, 24 Apr 2024 18:15:00 +0200
Subject: [PATCH 10/11] add comments to wikiman.yaml + adjust changes from main
 branch

---
 wikiman.yaml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/wikiman.yaml b/wikiman.yaml
index 067d3b667..3e5d74054 100644
--- a/wikiman.yaml
+++ b/wikiman.yaml
@@ -1,6 +1,6 @@
 ---
 mediawikiVersion: "1.39"
-mediawikiRepoRef: 3406e1b7d014d22f2a68237ebf447a88b5ac74ed
+#mediawikiRepoRef: commit hash goes here
 mediawikiRemove:
   - docs
   - extensions/README
@@ -49,12 +49,18 @@ extensions:
   - name: WikibaseCirrusSearch
     repoName: wikimedia/mediawiki-extensions-WikibaseCirrusSearch
     patchUrls:
+      # https://phabricator.wikimedia.org/T334191 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/WikibaseCirrusSearch/+/908801
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~908801/revisions/2/patch?download
+
+      # https://phabricator.wikimedia.org/T335105 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/WikibaseCirrusSearch/+/951473
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~951473/revisions/1/patch?download
+
   - name: WikibaseLexemeCirrusSearch
     repoName: wikimedia/mediawiki-extensions-WikibaseLexemeCirrusSearch
     patchUrls:
+      # https://phabricator.wikimedia.org/T334191 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/WikibaseLexemeCirrusSearch/+/908803
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseLexemeCirrusSearch~908803/revisions/1/patch?download
+
   - name: UniversalLanguageSelector
     repoName: wikimedia/mediawiki-extensions-UniversalLanguageSelector
   - name: cldr
@@ -126,7 +132,9 @@ extensions:
   - name: EntitySchema
     repoName: wikimedia/mediawiki-extensions-EntitySchema
     patchUrls:
+      # https://phabricator.wikimedia.org/T342001 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/EntitySchema/+/942447
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FEntitySchema~942447/revisions/2/patch?download
+
   - name: DismissableSiteNotice
     repoName: wikimedia/mediawiki-extensions-DismissableSiteNotice
   ## These extensions should not currently use the mediawikiVersion
@@ -143,10 +151,9 @@ extensions:
     repoName: nyurik/ThatSrc
     repoRef: 3e039311504eb82f8c5c488a457b9e376b5cf7e3
   ## These extensions use urls directly
-  # Using our own archive repo temporarily for our Federated Properties endeavour
-  # discussion: https://github.com/wbstack/mediawiki/pull/155
+  ### Obtain wikibase tar URL from https://www.mediawiki.org/wiki/Special:ExtensionDistributor?extdistname=Wikibase&extdistversion=REL1_39
   - name: Wikibase
-    url: https://github.com/wbstack/mediawiki-tars/raw/6428b996ab7c1f881022f477a660520e978af5e7/wikibase-1706623789-REL1_39.tar.gz
+    url: https://extdist.wmflabs.org/dist/extensions/Wikibase-REL1_39-a396986.tar.gz
     remove:
       - build
       - vendor
@@ -172,10 +179,18 @@ extensions:
       - lib/.storybook
       - lib/.vscode
     patchUrls:
+      # https://phabricator.wikimedia.org/T312256 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Wikibase/+/833742
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~833742/revisions/19/patch?download
+
+      # https://phabricator.wikimedia.org/T342000 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Wikibase/+/940955
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~940955/revisions/1/patch?download
-      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~943530/revisions/1/patch?download
+
+      # https://phabricator.wikimedia.org/T342001 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Wikibase/+/943530
+      - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~943530/revisions/2/patch?download
+
+      # https://phabricator.wikimedia.org/T335105 - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Wikibase/+/951472
       - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~951472/revisions/1/patch?download
+
   # It looks like StopForumSpam inadvertently introduced a dependency on AbuseFilter in REL1_39 (https://github.com/wikimedia/mediawiki-extensions-StopForumSpam/commit/3639e0120d53bf5643de57dc6e94293f69680e9f)
   # AFAIK it should be possible to run StopForumSpam without AbuseFilter installed (https://www.mediawiki.org/wiki/Extension:StopForumSpam#AbuseFilter_integration)
   # A subsequent patch, only available in REL1_40, appears to removes this dependency again (https://github.com/wikimedia/mediawiki-extensions-StopForumSpam/commit/5e3aab6e8be0e8effa97f9b454020230b6a70e3d)

From 626bfa8700f1fe52a2cdddf600a9edfe79c7315a Mon Sep 17 00:00:00 2001
From: Deniz Erdogan <deniz.erdogan@wikimedia.de>
Date: Wed, 24 Apr 2024 18:17:17 +0200
Subject: [PATCH 11/11] run wikiman

---
 pacman.yaml | 96 ++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pacman.yaml b/pacman.yaml
index 64210764b..c6b92624c 100644
--- a/pacman.yaml
+++ b/pacman.yaml
@@ -1,5 +1,5 @@
 - name: mediawiki
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki/zip/3406e1b7d014d22f2a68237ebf447a88b5ac74ed
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki/zip/374d95c464d317b2cd63fc9a98a84e5cf6e914ac
   artifactLevel: 1
   destination: ./dist
   remove:
@@ -24,7 +24,7 @@
     - extensions/README
     - skins/README
 - name: RevisionSlider
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-RevisionSlider/zip/e53e8886d4e1fe9af3ab842aea01333851310310
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-RevisionSlider/zip/39f4bb682c9f4569d6c2559410b831b27582d4d9
   artifactLevel: 1
   destination: ./dist/extensions/RevisionSlider
   remove:
@@ -68,7 +68,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: SpamBlacklist
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-SpamBlacklist/zip/f755ad8dd6a7d426d20cd94e99b791aad24a11dd
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-SpamBlacklist/zip/b75ca0387f46bad2e8424efba3f0ef24b22c7f8b
   artifactLevel: 1
   destination: ./dist/extensions/SpamBlacklist
   remove:
@@ -90,7 +90,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: ConfirmEdit
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-ConfirmEdit/zip/61f3df14bc5bffbe8534389f9014f814b6f281b6
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-ConfirmEdit/zip/e7546270dc5b8c82200ad2ee942cdd835bd383b2
   artifactLevel: 1
   destination: ./dist/extensions/ConfirmEdit
   remove:
@@ -112,7 +112,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: ConfirmAccount
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-ConfirmAccount/zip/048e6421aa8ab73fb5987fe7bc15a76ddc60f80d
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-ConfirmAccount/zip/906514925983105cdfa2d95ec9c83ec05d6e8d5d
   artifactLevel: 1
   destination: ./dist/extensions/ConfirmAccount
   remove:
@@ -134,7 +134,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Nuke
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Nuke/zip/53b439147438cabb4727994270b2593c94a799cd
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Nuke/zip/6692b3c38b98d31d6626931436ac5cc74a7f576f
   artifactLevel: 1
   destination: ./dist/extensions/Nuke
   remove:
@@ -156,7 +156,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: InviteSignup
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-InviteSignup/zip/0494ef7f05ab8eb16a126ab2bbd7b471aecf2439
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-InviteSignup/zip/41b745a0b2183ee54f5154f321c3da6068df0e5b
   artifactLevel: 1
   destination: ./dist/extensions/InviteSignup
   remove:
@@ -178,7 +178,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: TorBlock
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TorBlock/zip/5237911ead4b72bd5f3de2163e1dab979519f447
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TorBlock/zip/ac16ac6fbfa42a09a59e4b35ef03e9ad3bd2eb4e
   artifactLevel: 1
   destination: ./dist/extensions/TorBlock
   remove:
@@ -222,7 +222,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: CirrusSearch
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-CirrusSearch/zip/309af932b1816c26aaa2e6a8954a55c7a038e6f7
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-CirrusSearch/zip/09a09a5a367e85818a0441f9f13286624316c769
   artifactLevel: 1
   destination: ./dist/extensions/CirrusSearch
   remove:
@@ -244,7 +244,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: WikibaseCirrusSearch
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseCirrusSearch/zip/c4e1e83ee231652375a43d1558b4122278cdcb22
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseCirrusSearch/zip/c6a7b57631f27328d304b302dc20b5a8eb61f6a6
   artifactLevel: 1
   destination: ./dist/extensions/WikibaseCirrusSearch
   remove:
@@ -269,7 +269,7 @@
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~908801/revisions/2/patch?download
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~951473/revisions/1/patch?download
 - name: WikibaseLexemeCirrusSearch
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseLexemeCirrusSearch/zip/e867c9f0c3bd32d9941ad7b9c13f5d07ee1527fe
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseLexemeCirrusSearch/zip/3b2e0311a6c875268a0dc2bfdebbf97125f0864d
   artifactLevel: 1
   destination: ./dist/extensions/WikibaseLexemeCirrusSearch
   remove:
@@ -293,7 +293,7 @@
   patchUrls:
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseLexemeCirrusSearch~908803/revisions/1/patch?download
 - name: UniversalLanguageSelector
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector/zip/c518c7247d77b2958f8901bfde36161930e9fa46
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector/zip/5f39e04ac39f3fc365a24c5fb896cc59bfa3abe5
   artifactLevel: 1
   destination: ./dist/extensions/UniversalLanguageSelector
   remove:
@@ -315,7 +315,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: cldr
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-cldr/zip/12c0f71cc9d3061b30e265553a80a3daf167d841
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-cldr/zip/fcd6a488a398c77cabb3a07dda9e84b940a9b047
   artifactLevel: 1
   destination: ./dist/extensions/cldr
   remove:
@@ -337,7 +337,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Gadgets
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Gadgets/zip/6a8c11222cd8f0121062f58830f96ec6748c4cda
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Gadgets/zip/b539bf948c29cb1df96a103fe27177fafe557532
   artifactLevel: 1
   destination: ./dist/extensions/Gadgets
   remove:
@@ -359,7 +359,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Thanks
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Thanks/zip/8f5ceaa70fea582940101c9b64384c5f4e2f1dae
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Thanks/zip/746fb1b3db3979f3f1e6241e4fdaa40503f86968
   artifactLevel: 1
   destination: ./dist/extensions/Thanks
   remove:
@@ -381,7 +381,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: TwoColConflict
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TwoColConflict/zip/fd0c9346cafd4c3cf3196e2a90c4366d0ec270d4
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TwoColConflict/zip/39a227added21fb22f97b3a1001da746349600ca
   artifactLevel: 1
   destination: ./dist/extensions/TwoColConflict
   remove:
@@ -403,7 +403,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: OAuth
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-OAuth/zip/27c84fc5be3e2c7a9cbd517610c8edd72d531ce7
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-OAuth/zip/7462b4db82a22249d1551a975656ab364fe7f141
   artifactLevel: 1
   destination: ./dist/extensions/OAuth
   remove:
@@ -425,7 +425,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: WikibaseLexeme
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseLexeme/zip/ede25966aadf80613a97f97288389d512fe090d7
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseLexeme/zip/86b18da4dbea6859cb574f6c7a69eb5640f0eaa1
   artifactLevel: 1
   destination: ./dist/extensions/WikibaseLexeme
   remove:
@@ -447,7 +447,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: SyntaxHighlight_GeSHi
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-SyntaxHighlight_GeSHi/zip/8a0e18e99108c38aba642a2f0ba89c088f9567ac
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-SyntaxHighlight_GeSHi/zip/402c26d6013f1f87570610dcaea828451f528b93
   artifactLevel: 1
   destination: ./dist/extensions/SyntaxHighlight_GeSHi
   remove:
@@ -469,7 +469,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: JsonConfig
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-JsonConfig/zip/249754fac9861c61182940cf02314adcb17ddbf0
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-JsonConfig/zip/5ece7151fc91462fc56f21aacdc6c43e9d173122
   artifactLevel: 1
   destination: ./dist/extensions/JsonConfig
   remove:
@@ -491,7 +491,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Kartographer
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Kartographer/zip/7521d987b9d36e1b489fdc029888d7212ecd7f7b
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Kartographer/zip/86dcc8e88ab984c72c5fcb34bd27b4c3ba78cb25
   artifactLevel: 1
   destination: ./dist/extensions/Kartographer
   remove:
@@ -513,7 +513,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Math
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Math/zip/2cefe79441dc4406f92e78bd4af92ba979fa71b6
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Math/zip/8a037f4f57030f5e44ade0a7d27fc919d20f33c6
   artifactLevel: 1
   destination: ./dist/extensions/Math
   remove:
@@ -535,7 +535,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Score
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Score/zip/309bba5716eb8df83bc7b8f273b27caccd6f8ae0
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Score/zip/046835d95c45dacd9d93c37e617bbdb4de4ee46c
   artifactLevel: 1
   destination: ./dist/extensions/Score
   remove:
@@ -579,7 +579,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Scribunto
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Scribunto/zip/34f0ff477ad891ae695d507a220cf817c4634eca
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Scribunto/zip/6174f28d2fc4a670da181162814a88beec4dfd1a
   artifactLevel: 1
   destination: ./dist/extensions/Scribunto
   remove:
@@ -601,7 +601,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Cite
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Cite/zip/daca72b8a009823cbe2b6060048b8dda80e886fa
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Cite/zip/71b832936e5f2738e3466be681ea2ef6e0210a64
   artifactLevel: 1
   destination: ./dist/extensions/Cite
   remove:
@@ -623,7 +623,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: TemplateSandbox
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TemplateSandbox/zip/97b435b0849417092feacdef3e04d328b0bfec87
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TemplateSandbox/zip/67496db496f4ead899cdebb817d1093e79e5a0ad
   artifactLevel: 1
   destination: ./dist/extensions/TemplateSandbox
   remove:
@@ -645,7 +645,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: CodeEditor
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-CodeEditor/zip/1e3291f16916ed52fa589bbccb980ad011b00472
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-CodeEditor/zip/404f1c04f01a5719a5b6767ed088c2c877ea3821
   artifactLevel: 1
   destination: ./dist/extensions/CodeEditor
   remove:
@@ -667,7 +667,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: CodeMirror
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-CodeMirror/zip/47658a5f3f841e23b0573b3611a9c0ea9f37c168
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-CodeMirror/zip/4ccfe6a0e97c8dd8ce7d7e1410ef6d444ca6b606
   artifactLevel: 1
   destination: ./dist/extensions/CodeMirror
   remove:
@@ -689,7 +689,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: WikiEditor
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikiEditor/zip/b358ef285f908bf1b8d80fa9a5ae931d59b3ae6f
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikiEditor/zip/ae15b9b8551c30e1bd2b85eab00c903985098762
   artifactLevel: 1
   destination: ./dist/extensions/WikiEditor
   remove:
@@ -711,7 +711,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: SecureLinkFixer
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-SecureLinkFixer/zip/b615d519f3f71067c936e5bec71fb3e9514be5aa
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-SecureLinkFixer/zip/655d370bf9b74ba3056c8117c7238998af9898f0
   artifactLevel: 1
   destination: ./dist/extensions/SecureLinkFixer
   remove:
@@ -733,7 +733,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Echo
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Echo/zip/d80b6f4d7986cd816b28098173bc7929aeeb2b5f
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Echo/zip/89a7c0ead512e92a988f1cae41fb3d282818a4ae
   artifactLevel: 1
   destination: ./dist/extensions/Echo
   remove:
@@ -799,7 +799,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: TemplateData
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TemplateData/zip/a9dcf085175700af0385de93a1f57d53162d82cf
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TemplateData/zip/f99875c5794cb8fd6f1eea84fc8a9a8b0625e18f
   artifactLevel: 1
   destination: ./dist/extensions/TemplateData
   remove:
@@ -821,7 +821,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: AdvancedSearch
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-AdvancedSearch/zip/635f2bea13928d6ab96907bf040f76852817937a
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-AdvancedSearch/zip/627f2ed5c06361104fb600af0319ff66a19bd6a7
   artifactLevel: 1
   destination: ./dist/extensions/AdvancedSearch
   remove:
@@ -843,7 +843,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: ParserFunctions
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-ParserFunctions/zip/fc13208c3afbc5e1c212b130491d55b9d3581606
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-ParserFunctions/zip/1c94f1aecf10b6fc2d42c232ff72e6cfec11b3eb
   artifactLevel: 1
   destination: ./dist/extensions/ParserFunctions
   remove:
@@ -865,7 +865,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: MobileFrontend
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-MobileFrontend/zip/5ac2864b163285eb052f9022f36434beeb3c9ad2
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-MobileFrontend/zip/642a729ecdc0c0910eece638fefc401765f690ef
   artifactLevel: 1
   destination: ./dist/extensions/MobileFrontend
   remove:
@@ -887,7 +887,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: DeleteBatch
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-DeleteBatch/zip/85a968ef3705d5bdef8a287f0cb93d80aed05a26
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-DeleteBatch/zip/55ffaf9e9b288b6bac0bed1f80c201b74a3ca506
   artifactLevel: 1
   destination: ./dist/extensions/DeleteBatch
   remove:
@@ -909,7 +909,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: MultimediaViewer
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-MultimediaViewer/zip/10588e81cecf54382c1ff43bc8cdf609551affef
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-MultimediaViewer/zip/32794b6a456f50fde60e89c9111e6cf26e8fc534
   artifactLevel: 1
   destination: ./dist/extensions/MultimediaViewer
   remove:
@@ -931,7 +931,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Auth_remoteuser
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Auth_remoteuser/zip/87f18e40caca756ffd4cf5ace64c7182c99327a3
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Auth_remoteuser/zip/be2aadcc0fa0e9c593e5731e69a4407a99b9132f
   artifactLevel: 1
   destination: ./dist/extensions/Auth_remoteuser
   remove:
@@ -976,7 +976,7 @@
     - Doxyfile
     - infrastructure
 - name: WikiHiero
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikiHiero/zip/0081d875243e5b3538d6bbb990b26963a1adf18b
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikiHiero/zip/7c477dab785a95e2ddda878433b2a43a8775ee6c
   artifactLevel: 1
   destination: ./dist/extensions/WikiHiero
   remove:
@@ -998,7 +998,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: TextExtracts
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TextExtracts/zip/1e0f713c47f54a86f3f9997a62669dd86065d934
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-TextExtracts/zip/ef9507a140ac328977ce8392895f684fb8f4af0a
   artifactLevel: 1
   destination: ./dist/extensions/TextExtracts
   remove:
@@ -1020,7 +1020,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: EntitySchema
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-EntitySchema/zip/5165012e2c7332d678c290e53a714cf816268753
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-EntitySchema/zip/47ebc86de6bbcc858353231a5726ac5b8aefcb3a
   artifactLevel: 1
   destination: ./dist/extensions/EntitySchema
   remove:
@@ -1044,7 +1044,7 @@
   patchUrls:
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FEntitySchema~942447/revisions/2/patch?download
 - name: DismissableSiteNotice
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-DismissableSiteNotice/zip/7351193eb254a697200fd439529b20278c404656
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-DismissableSiteNotice/zip/4ee4fc9b9e0439b5af86ef9901cd235daf0bb4d9
   artifactLevel: 1
   destination: ./dist/extensions/DismissableSiteNotice
   remove:
@@ -1154,7 +1154,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Wikibase
-  artifactUrl: https://github.com/wbstack/mediawiki-tars/raw/6428b996ab7c1f881022f477a660520e978af5e7/wikibase-1706623789-REL1_39.tar.gz
+  artifactUrl: https://extdist.wmflabs.org/dist/extensions/Wikibase-REL1_39-a396986.tar.gz
   artifactLevel: 1
   destination: ./dist/extensions/Wikibase
   remove:
@@ -1201,7 +1201,7 @@
   patchUrls:
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~833742/revisions/19/patch?download
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~940955/revisions/1/patch?download
-    - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~943530/revisions/1/patch?download
+    - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~943530/revisions/2/patch?download
     - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibase~951472/revisions/1/patch?download
 - name: StopForumSpam
   artifactUrl: https://github.com/wikimedia/mediawiki-extensions-StopForumSpam/archive/5e3aab6e8be0e8effa97f9b454020230b6a70e3d.zip
@@ -1248,7 +1248,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Vector
-  artifactUrl: https://codeload.github.com/wikimedia/Vector/zip/0e072913ab2d96ade8d8d4851febbddefb28c277
+  artifactUrl: https://codeload.github.com/wikimedia/Vector/zip/ea87ff5466e5521fc7023f44dea3c7b494e37fd0
   artifactLevel: 1
   destination: ./dist/skins/Vector
   remove:
@@ -1270,7 +1270,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Timeless
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-skins-Timeless/zip/d6c555f699a342dde34b4bfb1da303f29e2f29c3
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-skins-Timeless/zip/cbcf941cf540c1124d03091bf8075dee7eb5f85f
   artifactLevel: 1
   destination: ./dist/skins/Timeless
   remove:
@@ -1292,7 +1292,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: Modern
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-skins-Modern/zip/fd0decbc34f1dea0373df7163eeba6b021dac8c9
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-skins-Modern/zip/c18dca329172c4ff9f5424b399f1e19b48dc2634
   artifactLevel: 1
   destination: ./dist/skins/Modern
   remove:
@@ -1314,7 +1314,7 @@
     - Gruntfile.js
     - Doxyfile
 - name: MinervaNeue
-  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-skins-MinervaNeue/zip/289fb5879b4bdd804e803c4655c6000f4315dcd6
+  artifactUrl: https://codeload.github.com/wikimedia/mediawiki-skins-MinervaNeue/zip/806e922910ca574c5fc1651f663cfe2e5c2eacb9
   artifactLevel: 1
   destination: ./dist/skins/MinervaNeue
   remove: