Merge branch 'main' into T399694-deploy-traefik-decouple

Author: lorenjohnson

build/wikibase/CHANGELOG.md

@@ -1,3 +1,26 @@
+# 5.0.0 (2025-07-24)
+
+
+### 💅 Refactors
+
+- ⚠️  move callback to wikibase image
+
+
+### 📦 Build
+
+- depth 1 checkouts in wikibase-image build
+
+
+### 🏡 Chore
+
+- ⚠️  bump mediawiki to 1.44.0
+
+
+#### ⚠️  Breaking Changes
+
+- ⚠️  move callback to wikibase image
+- ⚠️  bump mediawiki to 1.44.0
+
 ## 4.1.1 (2025-07-17)
 
 

build/wikibase/LocalSettings.d/30_WikibaseManifest.php

@@ -4,3 +4,18 @@
 
 ## WikibaseManifest Configuration
 wfLoadExtension( 'WikibaseManifest' );
+
+$quickstatements_url = getenv('QUICKSTATEMENTS_PUBLIC_URL');
+if (!empty($quickstatements_url)) {
+  $wgWbManifestExternalServiceMapping['quickstatements'] = $quickstatements_url;
+}
+
+$wdqs_endpoint_url = getenv('WDQS_PUBLIC_ENDPOINT_URL');
+if (!empty($wdqs_endpoint_url)) {
+  $wgWbManifestExternalServiceMapping['queryservice'] = $wdqs_endpoint_url;
+}
+
+$wdqs_frontend_url = getenv('WDQS_PUBLIC_FRONTEND_URL');
+if (!empty($wdqs_frontend_url)) {
+  $wgWbManifestExternalServiceMapping['queryservice_ui'] = $wdqs_frontend_url;
+}

build/wikibase/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikibase",
-	"version": "4.1.1",
+	"version": "5.0.0",
 	"nx": {
 		"targets": {
 			"lint": {},

deploy/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 5.0.0 (2025-07-24)
+
+
+### 💅 Refactors
+
+- ⚠️  move callback to wikibase image
+
+
+### 📖 Documentation
+
+- suggest METADATA_CALLBACK settings
+
+- notes about upgrade from 4 to 5
+
+
+#### ⚠️  Breaking Changes
+
+- ⚠️  move callback to wikibase image
+
 ## 4.2.1 (2025-07-11)
 
 

deploy/README.md

@@ -269,6 +269,14 @@ Look for changes in the new `template.env` that you might want to apply to your
 
 #### Apply any migrations for your version
 
+<details><summary><strong>WBS Deploy 4.x.x to 5.x.x</strong></summary><p>
+
+Wikibase Image switched from version 4.x.x to 5.x.x; this upgrades MediaWiki from 1.43 to 1.44. Please read the [MediaWiki UPGRADE file](https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/refs/heads/REL1_44/UPGRADE).
+
+Please, note that the `.env` file now requires setting `METADATA_CALLBACK`. Find more details about it in `template.env`.
+
+</p></details>
+
 <details><summary><strong>WBS Deploy 3.x.x to 4.x.x</strong></summary><p>
 
 Wikibase Image switched from version 3.x.x to 4.x.x; this upgrades MediaWiki from 1.42 to 1.43. Please read the [MediaWiki UPGRADE file](https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/core/+/refs/heads/REL1_43/UPGRADE).

deploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "deploy",
-	"version": "4.2.1",
+	"version": "5.0.0",
 	"nx": {
 		"targets": {
 			"lint": {},

deploy/template.env

@@ -24,9 +24,12 @@
 # If you change your mind you can always remove your instance from the list by
 # sending an E-Mail to wikibase-suite-support@wikimedia.de
 #
-# Set to true to opt-in to the list of known Wikibases.
-# Set to false to not take part.
-METADATA_CALLBACK=
+# Uncomment true to opt-in to the list of known Wikibases.
+# Uncomment false to not take part.
+# You will need to choose one of the options below, otherwise the Wikibase
+# container will stop with an error.
+#METADATA_CALLBACK=true
+#METADATA_CALLBACK=false
 
 # Public hostname configuration.
 #

test/specs/repo/extensions/wikibase-manifest.ts

@@ -17,5 +17,15 @@ describe( 'WikibaseManifest', function () {
 		expect( data.oauth.registration_page ).toEqual(
 			testEnv.vars.WIKIBASE_URL + '/wiki/Special:OAuthConsumerRegistration'
 		);
+
+		expect( data.external_services.queryservice ).toEqual(
+		  testEnv.vars.WDQS_URL + '/sparql'
+		);
+		expect( data.external_services.queryservice_ui ).toEqual(
+		  testEnv.vars.WDQS_URL
+		);
+		expect( data.external_services.quickstatements ).toEqual(
+		  testEnv.vars.QUICKSTATEMENTS_URL
+		);
 	} );
 } );

test/suites/docker-compose.override.yml

@@ -17,6 +17,8 @@ services:
     environment:
       MW_WG_SERVER: ${WIKIBASE_URL}
       QUICKSTATEMENTS_PUBLIC_URL: ${QUICKSTATEMENTS_URL}
+      WDQS_PUBLIC_FRONTEND_URL: http://${WDQS_PUBLIC_HOST}
+      WDQS_PUBLIC_ENDPOINT_URL: http://${WDQS_PUBLIC_HOST}/sparql
 
   wikibase-jobrunner:
     image: wikibase/wikibase