Releaseprep wmde.17

.github/workflows/_build_test.yml

@@ -123,18 +123,15 @@ jobs:
       matrix:
         # TODO: can we get this from the environment to not have it hardcoded in the pipeline code?
         version: [
-            # Latest 1.37
-            "WMDE9",
-            "WMDE9_BUNDLE",
             # Latest 1.38
             "WMDE12",
             "WMDE12_BUNDLE",
             # Latest 1.39
             "WMDE15",
             "WMDE15_BUNDLE",
-            # Previous 1.40
-            "WMDE14",
-            "WMDE14_BUNDLE"
+            # Latest 1.40
+            "WMDE16",
+            "WMDE16_BUNDLE"
           ]
 
     steps:

CHANGES.md

@@ -3,6 +3,15 @@
 This file is only intended to serve the developers of this repository and of the releases.
 This provides an overview of the releases that have been made using this release pipeline.
 
+## March 2024: Mayor releases for 1.41.0
+- [MediaWiki release announcement: 1.41.0](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/OMDFHJ2SKKJH775RW4UTC754OY4TP7UU/)
+- [MediaWiki full release notes](https://www.mediawiki.org/wiki/Release_notes/1.41)
+- [Wikibase Suite Release task T354644](https://phabricator.wikimedia.org/T354644)
+
+| Suite Version | Version Info | Date available | Release task  |
+|---------------|----------------------|----------------|------------| --------------|
+| wmde.17 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.17/variables.env)) | MediaWiki (1.41.0, PHP 8.2.15, debian/apache 2.4.57-2), WDQS (0.3.137)    | 06 March 2024 | [T354644](https://phabricator.wikimedia.org/T354644) |
+
 ## February 2024: Security releases for 1.40.2
 - [MediaWiki security and maintenance release announcement: 1.35.14 / 1.39.6 / 1.40.2](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/TDBUBCCOQJUT4SCHJNPHKQNPBUUETY52/)
 - [MediaWiki full release notes](https://www.mediawiki.org/wiki/Release_notes/1.40)

build/Wikibase/Dockerfile

@@ -17,6 +17,10 @@ RUN git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase /tmp/
 FROM ${MEDIAWIKI_IMAGE_URL} as collector
 COPY --from=git-checkout /tmp/wikibase /var/www/html/extensions/Wikibase
 
+COPY ./fix-do-not-add-stdport-in-detectServer.patch /tmp/fix-do-not-add-stdport-in-detectServer.patch
+WORKDIR /var/www/html
+RUN patch -Np1 < /tmp/fix-do-not-add-stdport-in-detectServer.patch
+
 # ###########################################################################
 # hadolint ignore=DL3006
 FROM ${COMPOSER_IMAGE_URL} as composer

build/Wikibase/fix-do-not-add-stdport-in-detectServer.patch

@@ -0,0 +1,17 @@
+diff --git a/includes/Request/WebRequest.php b/includes/Request/WebRequest.php
+index 734076449b8..78acae64100 100644
+--- a/includes/Request/WebRequest.php
++++ b/includes/Request/WebRequest.php
+@@ -288,10 +288,10 @@ class WebRequest {
+ 				$port = $stdPort;
+ 			} elseif ( $parts[1] === false ) {
+ 				if ( isset( $_SERVER['SERVER_PORT'] ) ) {
+-					$port = $_SERVER['SERVER_PORT'];
++					$port = (int)$_SERVER['SERVER_PORT'];
+ 				} // else leave it as $stdPort
+ 			} else {
+-				$port = $parts[1];
++				$port = (int)$parts[1];
+ 			}
+ 			break;
+ 		}

test/helpers/pages/queryservice-ui/queryservice-ui.page.ts

@@ -14,7 +14,6 @@ class QueryServiceUIPage extends SubmittablePage {
 	 *
 	 * @param {string} query
 	 * @param {string[]} prefixes - Optional
-	 * @return {void}
 	 */
 	public async open( query: string, prefixes: string[] = [] ): Promise<void> {
 		await browser.url( testEnv.vars.WDQS_FRONTEND_URL );

test/specs/repo/extensions/universal-language-selector.ts

@@ -5,9 +5,23 @@ describe( 'UniversalLanguageSelector', function () {
 
 	it( 'Should be able to see the language selector menu', async function () {
 		await browser.url( testEnv.vars.WIKIBASE_URL );
-		await $( '#searchInput' ).click();
-		await $( '.imeselector' ).click();
 
-		await expect( $( '.imeselector-menu h3' ) ).toHaveText( 'English' );
+		await $( '#searchform input' ).click();
+
+		// work around lang selector not showing up the first time
+		// blur the search bar
+		await $( '.page-Main_Page' ).click();
+		// focus search bar again, lang selector should be there now
+		await $( '#searchform input' ).click();
+
+		await $$( '.imeselector' )
+			.filter( async ( selector ) => selector.isClickable() )[ 0 ]
+			.click();
+
+		// we need to use getHTML, getText() is the empty string for some reason,
+		// does it think the element is hidden?
+		await expect(
+			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()
+		).resolves.toMatch( /English/ );
 	} );
 } );

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

@@ -9,13 +9,13 @@ describe( 'WikibaseManifest', function () {
 		);
 		const data = result.data;
 
-		expect( 'wikibase-docker' ).toBe( data.name );
+		expect( data.name ).toBe( 'wikibase-docker' );
 
-		expect( testEnv.vars.WIKIBASE_URL + '/w/api.php' ).toBe( data.api.action );
-		expect( testEnv.vars.WIKIBASE_URL + '/w/rest.php' ).toBe( data.api.rest );
+		expect( data.api.action ).toBe( testEnv.vars.WIKIBASE_URL + '/w/api.php' );
+		expect( data.api.rest ).toBe( testEnv.vars.WIKIBASE_URL + '/w/rest.php' );
 
-		expect(
+		expect( data.oauth.registration_page ).toBe(
 			testEnv.vars.WIKIBASE_URL + '/wiki/Special:OAuthConsumerRegistration'
-		).toBe( data.oauth.registration_page );
+		);
 	} );
 } );

test/specs/repo/property.ts

@@ -89,6 +89,7 @@ describe( 'Property', function () {
 
 			it( 'Should display the added properties on the "Recent changes" page', async function () {
 				await browser.waitForJobs();
+				await $( '.vector-main-menu-dropdown' ).click();
 				await $( '=Recent changes' ).click();
 				await expect( $( `=(${ propertyId })` ) ).toExist();
 				await expect( $( `=(${ stringPropertyId })` ) ).toExist();
@@ -120,7 +121,7 @@ describe( 'Property', function () {
 				await page.open( '/wiki/Special:SetLabelDescriptionAliases/' );
 				await $( 'label=ID:' ).click();
 				await browser.keys( propertyId.split( '' ) );
-				await $( 'span=Set label, description and aliases' ).click();
+				await $( 'span=Continue' ).click();
 
 				await $( 'label=Label:' ).click();
 				await browser.keys( `${ dataType.name } Label`.split( '' ) );
@@ -131,7 +132,7 @@ describe( 'Property', function () {
 					`${ dataType.name } Alias A|${ dataType.name } Alias B`.split( '' )
 				);
 
-				await $( 'span=Set label, description and aliases' ).click();
+				await $( 'span=Save changes' ).click();
 
 				await expect(
 					$( `span.wikibase-labelview-text=${ dataType.name } Label` )

test/specs/repo/queryservice.ts

@@ -3,6 +3,7 @@ import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { getTestString } from 'wdio-mediawiki/Util.js';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
 import QueryServiceUIPage from '../../helpers/pages/queryservice-ui/queryservice-ui.page.js';
+import SpecialNewItemPage from '../../helpers/pages/special/new-item.page.js';
 import { wikibasePropertyString } from '../../helpers/wikibase-property-types.js';
 
 describe( 'QueryService', function () {
@@ -128,9 +129,37 @@ describe( 'QueryService', function () {
 	} );
 
 	it( 'Should not show up in queryservice ui after deletion', async function () {
-		// TODO make an item using the UI
-		const itemId = await WikibaseApi.createItem( getTestString( 'T267743-' ) );
+		await SpecialNewItemPage.open();
 
+		await $( 'input[name="label"]' ).setValue( getTestString( 'T267743-' ) );
+		await $( 'input[name="description"]' ).setValue( getTestString( 'Description' ) );
+		await $( 'input[name="aliases"]' ).setValue(
+			`${ getTestString( 'A' ) }|${ getTestString( 'B' ) }`
+		);
+		await SpecialNewItemPage.submit();
+
+		await expect( $( 'h1#firstHeading' ).$( 'span.wikibase-title-id' ) ).toHaveText(
+			/\(Q\d+\)/
+		);
+		const itemId = (
+			await $( 'h1#firstHeading' ).$( 'span.wikibase-title-id' ).getText()
+		).replace( /[()]/g, '' );
+
+		// Check it shows up after creation
+		await QueryServiceUIPage.open( `SELECT * WHERE{ wd:${ itemId } ?p ?o }` );
+
+		// wait for WDQS-updater
+		// eslint-disable-next-line wdio/no-pause
+		await browser.pause( 20 * 1000 );
+
+		await QueryServiceUIPage.submit();
+		await QueryServiceUIPage.resultTable;
+
+		await expect(
+			QueryServiceUIPage.resultIncludes( 'schema:version' )
+		).resolves.toBe( true );
+
+		// Attempt to delete
 		await LoginPage.login(
 			testEnv.vars.MW_ADMIN_NAME,
 			testEnv.vars.MW_ADMIN_PASS

test/suites/client-LocalSettings.php.template

@@ -87,6 +87,10 @@ foreach (glob("LocalSettings.d/*.php") as ${DOLLAR}filename)
 		continue;
 	}
 
+	if (strpos(${DOLLAR}filename, 'EntitySchema') !== false) {
+		continue;
+	}
+
 	if (strpos(${DOLLAR}filename, 'Elastic') !== false) {
 		continue;
 	}

test/suites/upgrade/versions.ts

@@ -23,6 +23,9 @@ export const versions = {
 	WMDE16: 'wikibase/wikibase:1.40.2-wmde.16',
 	WMDE16_BUNDLE: 'wikibase/wikibase-bundle:1.40.2-wmde.16',
 
+	WMDE17: 'wikibase/wikibase:1.41.0-wmde.17',
+	WMDE17_BUNDLE: 'wikibase/wikibase-bundle:1.41.0-wmde.17',
+
 	LOCAL_BUILD: 'wikibase/wikibase',
 	LOCAL_BUILD_BUNDLE: 'wikibase/wikibase-bundle'
 };

variables.env

@@ -16,8 +16,8 @@ WMDE_RELEASE_VERSION=main
 # Update only patch versions for security releases.
 # Choose latest version for major releases.
 # https://hub.docker.com/_/mediawiki
-MEDIAWIKI_VERSION=1.40.2
-MEDIAWIKI_IMAGE_URL=mediawiki:1.40.2
+MEDIAWIKI_VERSION=1.41.0
+MEDIAWIKI_IMAGE_URL=mediawiki:1.41.0
 
 
 # ##############################################################################
@@ -49,8 +49,8 @@ ELASTICSEARCH_IMAGE_URL=docker.elastic.co/elasticsearch/elasticsearch:7.10.2
 # Update to latest for major releases.
 #
 # https://central.sonatype.com/artifact/org.wikimedia.search/extra
-# https://github.com/wikimedia/search-extra/compare/extra-parent-7.10.2-wmf4...extra-parent-7.10.2-wmf10
-ELASTICSEARCH_PLUGIN_WIKIMEDIA_EXTRA=7.10.2-wmf4
+# https://github.com/wikimedia/search-extra/compare/extra-parent-7.10.2-wmf4...extra-parent-7.10.2-wmf12
+ELASTICSEARCH_PLUGIN_WIKIMEDIA_EXTRA=7.10.2-wmf12
 
 # https://central.sonatype.com/artifact/org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin
 ELASTICSEARCH_PLUGIN_WIKIMEDIA_HIGHLIGHTER=7.10.2
@@ -76,14 +76,15 @@ COMPOSER_IMAGE_URL=docker-registry.wikimedia.org/releng/composer-php82:0.1.0-s3
 # https://mariadb.org/mariadb/all-releases/
 MARIADB_IMAGE_URL=mariadb:10.11
 
-# https://hub.docker.com/_/nginx 
-NGINX_IMAGE_URL=nginx:1.25.3-bookworm
+# https://hub.docker.com/_/nginx
+NGINX_IMAGE_URL=nginx:1.25.4-bookworm
 
 # https://hub.docker.com/_/node
 NODE_IMAGE_URL=node:20.11.1-bookworm
 
+# https://www.php.net/supported-versions.php
 # https://hub.docker.com/_/php
-PHP_IMAGE_URL=php:8.1.27-apache-bookworm
+PHP_IMAGE_URL=php:8.2.15-apache-bookworm
 
 # https://hub.docker.com/_/eclipse-temurin
 # https://github.com/docker-library/docs/tree/master/eclipse-temurin/README.md#supported-tags-and-respective-dockerfile-links
@@ -96,43 +97,50 @@ JRE_IMAGE_URL=eclipse-temurin:8u402-b06-jre-jammy
 DEBIAN_IMAGE_URL=debian:bookworm-slim
 
 
+# ******************************************************************************
+# ******************************************************************************
+# Versions below are automatically updated by ./build.sh update_hashes
+# ******************************************************************************
+# ******************************************************************************
+
+
 # ##############################################################################
 # WMF maintained extensions
 # ##############################################################################
 # Updated automatically by ./build.sh update_hashes
 # Versions in REL_ branches ensure compatibility with respective mediawiki versions.
 # Shouldn't require much of a review.
 #
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_40
-WIKIBASE_COMMIT=903c3f9d0513d4e847727d73b0ab5c742c2d2f09
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_40
-BABEL_COMMIT=43e9555fb5ffc00dfc76dd32aa12febe483d39d3
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_40
-CLDR_COMMIT=ac9ad554535c7160bd982be0cce1b9a73890bc46
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_40
-CIRRUSSEARCH_COMMIT=9a51bae5915b6fc20cbaa80f5b3dbe12e738ed86
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_40
-CONFIRMEDIT_COMMIT=d4075f7e67aaea04627703e1c4f08743196d7854
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_40
-ELASTICA_COMMIT=b3b7675e8208f28fbf0a7939c108acf3e301656e
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_40
-ENTITYSCHEMA_COMMIT=597c8bbd32810605262df7f2f9d20d02d8b7552f
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_40
-NUKE_COMMIT=220878a258fbfb1a4ef48b049ea1364816ef3149
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_40
-OAUTH_COMMIT=0b21f8acdf38d5d9b19fb42197e07211925d0541
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_40
-SCRIBUNTO_COMMIT=89255870fd6a8f3aa98782cc5260d2f1c0b2ad4d
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_40
-SYNTAXHIGHLIGHT_GESHI_COMMIT=79787a3234b293f57482de4964a802375256403e
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_40
-UNIVERSALLANGUAGESELECTOR_COMMIT=de7670d2217316401b7d38735a7be0e4482f1b42
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_40
-VISUALEDITOR_COMMIT=00b627cb83f95a6dc62c640969429ab99c8cad2e
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_40
-WIKIBASECIRRUSSEARCH_COMMIT=c88e34b0b2f6dbeb7f69cacdd40d95e6101f9807
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_40
-WIKIBASEMANIFEST_COMMIT=10f0ddcb7eac28f56999f983f169cf7b1c6e240a
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_41
+WIKIBASE_COMMIT=c42002be38fa2756b8e475b38b1e6ab86d4f53ce
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_41
+BABEL_COMMIT=e110eaa7293796ae3cf149177551997cc2009095
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_41
+CLDR_COMMIT=cad7768c4bd092318067fe15d674bf17ff965e2a
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_41
+CIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_41
+CONFIRMEDIT_COMMIT=9fb5930d4485a72001016ad62e63e457addb91f2
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_41
+ELASTICA_COMMIT=24f94b80b51555e5e5b30b0633d215ee001650d4
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_41
+ENTITYSCHEMA_COMMIT=85ea615968509afab9214c572ac7aedc7dda4424
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_41
+NUKE_COMMIT=8e969d99c09faac3ec64b35ce5553e7ec8c87b28
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_41
+OAUTH_COMMIT=8cdf22304b8382ef0015da9ef3210f90eb7687ce
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_41
+SCRIBUNTO_COMMIT=825e1203b060850804885041dcd5d744f81a5df0
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_41
+SYNTAXHIGHLIGHT_GESHI_COMMIT=40908dd4204915eb20f1e43161c0489c7571f37d
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_41
+UNIVERSALLANGUAGESELECTOR_COMMIT=47158fbee4ce6870133c29f1ed6affdb2eb31acc
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_41
+VISUALEDITOR_COMMIT=753916e615161ee417bd5c6a37a19cbcffd49fb0
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_41
+WIKIBASECIRRUSSEARCH_COMMIT=7a4fdf2342eaecee9217e430d702c03c66dab55c
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_41
+WIKIBASEMANIFEST_COMMIT=8c7cdae4d5a1e68b19fcca8eb5c2a7b6e3dc3e55
 
 
 # ##############################################################################
@@ -159,7 +167,7 @@ MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5
 # No versioning scheme. Review changes carefully.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/gui/+/refs/heads/master
-WDQSQUERYGUI_COMMIT=4f355e5e1ee4747471b6cedb2fc78fe29f9c8cb7
+WDQSQUERYGUI_COMMIT=ff6d1c0413dc661d45ee16b6dbb624cd82cfc174
 
 
 # ##############################################################################