Merge branch 'main' into T345689-build-three-versions-plain

.github/workflows/build_and_test.yml

@@ -10,7 +10,6 @@ on:
       - '**/*.md'
       - '**/*.txt'
 
-
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -157,12 +156,13 @@ jobs:
       matrix:
         # TODO: can we get this from the environment to not have it hardcoded in the pipeline code?
         version: [
-            # Latest 1.37
-            "wmde.9",
-            # Latest 1.38
-            "wmde.10",
-          ]
-
+          # Latest 1.37
+          'wmde.9',
+          # Latest 1.38
+          'wmde.12',
+          # Latest 1.39
+          'wmde.11',
+        ]
     needs:
       - build
 
@@ -205,11 +205,13 @@ jobs:
       matrix:
         # TODO: can we get this from the environment to not have it hardcoded in the pipeline code?
         version: [
-            # Latest 1.37
-            "wmde.9-bundle",
-            # Latest 1.38
-            "wmde.10-bundle",
-          ]
+          # Latest 1.37
+          'wmde.9-bundle',
+          # Latest 1.38
+          'wmde.12-bundle',
+          # Latest 1.39
+          'wmde.11-bundle',
+        ]
 
     env:
       TARGET_WIKIBASE_UPGRADE_IMAGE_NAME: wikibase-bundle

CHANGES.md

@@ -4,6 +4,20 @@ This file is only intended to serve the developers of this repository and of the
 
 This provides an overview of the releases that have been made using this release pipeline.
 
+## October 2023: Security releases for 1.39.5
+
+- [Maintenance release: MediaWiki 1.39.2](https://lists.wikimedia.org/hyperkitty/list/[email protected]/message/UJBH5OGW5M5Q22KETIQY4MV2Q6XJPQWG/)
+- [MediaWiki security and maintenance release announcement: 1.35.10 / 1.38.6 / 1.39.3](https://lists.wikimedia.org/hyperkitty/list/[email protected]/message/6UQBHI5FWLATD7QO7DI4YS54U7XSSLAN/)
+- [MediaWiki security and maintenance release announcement: 1.35.11 / 1.38.7 / 1.39.4](https://lists.wikimedia.org/hyperkitty/list/[email protected]/thread/HVT3U3XYY35PSCIQPHMY4VQNF3Q6MHUO/)
+- [MediaWiki security and maintenance release announcement: 1.35.12 / 1.39.5 / 1.40.1](https://lists.wikimedia.org/hyperkitty/list/[email protected]/message/BRWOWACCHMYRIS7JRTT6XD44X3362MVL/)
+
+- [MediaWiki full release notes](https://www.mediawiki.org/wiki/Release_notes/1.39)
+
+| Suite Version | MediaWiki release                                                       | Date available | Run number     | Release task  |
+|---------------|-------------------------------------------------------------------------|----------------|----------------| --------------|
+| wmde.13 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.13/versions/wmde13.env),[metadata](https://github.com/wmde/wikibase-release-pipeline/blob/main/versions/wmde13)) | MediaWiki (1.39.5, PHP 8.1.24, debian/apache2 2.4.57-2), WDQS (0.3.135) | October 2023 | [6637828869](https://github.com/wmde/wikibase-release-pipeline/actions/runs/6637828869) | [T348616](https://phabricator.wikimedia.org/T348616) |
+
+
 ## August 2023: Security releases for 1.38.7
 
 - [MediaWiki security and maintenance release announcement: 1.35.10 / 1.38.6 / 1.39.3](https://lists.wikimedia.org/hyperkitty/list/[email protected]/message/6UQBHI5FWLATD7QO7DI4YS54U7XSSLAN/)
@@ -19,7 +33,7 @@ This provides an overview of the releases that have been made using this release
 The [standard MediaWiki upgrade process](https://www.mediawiki.org/wiki/Manual:Upgrading) can be followed for this release.
 
 - [MediaWiki release notes](https://www.mediawiki.org/wiki/Release_notes/1.39)
-- [Wikibase release notes](https://github.com/wikimedia/Wikibase/blob/REL1_38/RELEASE-NOTES-1.39)
+- [Wikibase release notes](https://github.com/wikimedia/Wikibase/blob/REL1_39/RELEASE-NOTES-1.39)
 
 Users that still have lines in their LocalSettings.php file that look like this:
  - `require_once "$IP/extensions/Wikibase/client/WikibaseClient.php"`

Docker/publish/download_artifacts/download_artifacts.py

@@ -23,7 +23,15 @@
     for artifact in artifactsMetadata['artifacts']:
         print('Downloading %d bytes from %s' % (artifact['size_in_bytes'], artifact['name']))
 
-        r = requests.get( artifact['archive_download_url'], allow_redirects=True, headers={"Authorization": 'Bearer ' + os.getenv('GITHUB_TOKEN') } )
+        token = os.getenv('GITHUB_TOKEN')
+        if token is None:
+            raise Exception("need a github access token with repo and workflow scope in GITHUB_TOKEN env")
+
+        r = requests.get(
+                artifact['archive_download_url'], 
+                allow_redirects=True, 
+                headers={"Authorization": 'Bearer ' + token } )
+
         if r.status_code != 200:
             errorMessage = "Unknown error (http " + str(r.status_code) + ")."
             try:

example/template.env

@@ -2,13 +2,13 @@
 # WARNING: Do not add comments on the same line as env vars, as in some environments they will be included in the var!
 
 ## Image Configuration
-WIKIBASE_IMAGE_NAME=wikibase/wikibase:1.39.1-wmde.11
-WDQS_IMAGE_NAME=wikibase/wdqs:0.3.121-wmde.11
-WDQS_FRONTEND_IMAGE_NAME=wikibase/wdqs-frontend:wmde.11
-ELASTICSEARCH_IMAGE_NAME=wikibase/elasticsearch:7.10.2-wmde.11
-WIKIBASE_BUNDLE_IMAGE_NAME=wikibase/wikibase-bundle:1.39.1-wmde.11
-QUICKSTATEMENTS_IMAGE_NAME=wikibase/quickstatements:wmde.11
-WDQS_PROXY_IMAGE_NAME=wikibase/wdqs-proxy:wmde.11
+WIKIBASE_IMAGE_NAME=wikibase/wikibase:1.39.5-wmde.13
+WDQS_IMAGE_NAME=wikibase/wdqs:0.3.135-wmde.13
+WDQS_FRONTEND_IMAGE_NAME=wikibase/wdqs-frontend:wmde.13
+ELASTICSEARCH_IMAGE_NAME=wikibase/elasticsearch:7.10.2-wmde.13
+WIKIBASE_BUNDLE_IMAGE_NAME=wikibase/wikibase-bundle:1.39.5-wmde.13
+QUICKSTATEMENTS_IMAGE_NAME=wikibase/quickstatements:wmde.13
+WDQS_PROXY_IMAGE_NAME=wikibase/wdqs-proxy:wmde.13
 MYSQL_IMAGE_NAME=mariadb:10.9
 
 ## Mediawiki Configuration

test/suites/upgrade/old-versions/wmde.11-bundle.env

@@ -0,0 +1 @@
+WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase-bundle:1.39.1-wmde.11

test/suites/upgrade/old-versions/wmde.11.env

@@ -0,0 +1 @@
+WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase:1.39.1-wmde.11

test/suites/upgrade/old-versions/wmde.12-bundle.env

@@ -0,0 +1 @@
+WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase-bundle:1.38.7-wmde.12

test/suites/upgrade/old-versions/wmde.12.env

@@ -0,0 +1 @@
+WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase:1.38.7-wmde.12

versions/wmde13.env

@@ -0,0 +1,51 @@
+WMDE_RELEASE_VERSION=wmde.13
+WIKIBASE_BRANCH_NAME=REL1_39
+MEDIAWIKI_BRANCH_NAME=REL1_39
+
+# WDQS_VERSION 0.3.135 is latest release on 2023-10-11
+# as per https://github.com/wikimedia/wikidata-query-rdf/tags
+# and https://archiva.wikimedia.org/repository/releases/org/wikidata/query/rdf/service/
+WDQS_VERSION=0.3.135
+
+# Head of master on 2023-10-11
+# as per https://github.com/wikimedia/wikidata-query-gui/
+WDQS_FRONTEND_COMMIT_HASH=4e94cdecec4aaa252465429dc9024b3dcc0056b5
+
+# Head of master on 2023-10-11
+# as per https://github.com/magnusmanske/quickstatements/commits/master
+QUICKSTATEMENTS_COMMIT_HASH=c4b2c6b086b319aa32dcdd7a323edf188faaa66d
+
+# Head of master on 2023-10-11
+# as per https://bitbucket.org/magnusmanske/magnustools/commits/branch/master
+MAGNUSTOOLS_COMMIT_HASH=11e19400271a47c4d7e927bcb7aa95f1bfaf38a9
+
+# Head of master on 2023-10-11
+# as per https://github.com/ProfessionalWiki/WikibaseLocalMedia/tree/master
+WIKIBASELOCALMEDIA_COMMIT_HASH=6dcc6e82526896352b6bae1df11750f378201fcb
+
+# Head of master on 2023-10-11
+# as per https://github.com/ProfessionalWiki/WikibaseEdtf/tree/master
+WIKIBASEEDTF_COMMIT_HASH=5596403a27d8e4a5ac044257c49be3e0685318a6
+
+# No new extensions to be added
+BUNDLE_EXT_EXTENSIONS=WikibaseLocalMedia,WikibaseEdtf
+BUNDLE_WMF_EXTENSIONS=Babel,cldr,CirrusSearch,ConfirmEdit,Elastica,EntitySchema,Nuke,OAuth,Scribunto,SyntaxHighlight_GeSHi,UniversalLanguageSelector,VisualEditor,WikibaseCirrusSearch,WikibaseManifest
+
+
+MEDIAWIKI_MAJOR_VERSION=1.39
+MEDIAWIKI_VERSION=1.39.5
+
+
+RELEASE_MAJOR_VERSION=1.39
+RELEASE_VERSION=1.39.5
+
+
+# MediaWiki 1.39+ require Elasticsearch 7.10.2 per https://www.mediawiki.org/wiki/Extension:CirrusSearch
+# NOTE ELASTICSEARCH_VERSION 7.10.3+ is release under a non-osi approved license
+# 7.10.2 is currently being used by the WMF 07-Feb-2023
+ELASTICSEARCH_VERSION=7.10.2
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=7.10.2-wmf4
+
+
+COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php82
+COMPOSER_IMAGE_VERSION=latest

versions/wmde13/build_metadata_babel.env

@@ -0,0 +1 @@
+METADATA_BABEL_COMMIT_HASH=62135b8332e1f7d35864943705e010fa8d205bfd

versions/wmde13/build_metadata_cirrussearch.env

@@ -0,0 +1 @@
+METADATA_CIRRUSSEARCH_COMMIT_HASH=f28812273aa1e5d21754b0e2bb429ed7dedb4106

versions/wmde13/build_metadata_cldr.env

@@ -0,0 +1 @@
+METADATA_CLDR_COMMIT_HASH=58eee32828a9a5930f12cc1c1c9841b58b80258a

versions/wmde13/build_metadata_confirmedit.env

@@ -0,0 +1 @@
+METADATA_CONFIRMEDIT_COMMIT_HASH=d59de67ad32c6d78412e4a17897cbdcda79dcf78

versions/wmde13/build_metadata_elastica.env

@@ -0,0 +1 @@
+METADATA_ELASTICA_COMMIT_HASH=22172e91fac46e0efa8f8377edb498999456b7c4

versions/wmde13/build_metadata_entityschema.env

@@ -0,0 +1 @@
+METADATA_ENTITYSCHEMA_COMMIT_HASH=cecedd6def1a31eb9c19c72abf5d7a10732383f5

versions/wmde13/build_metadata_magnustools.env

@@ -0,0 +1 @@
+METADATA_MAGNUSTOOLS_COMMIT_HASH=11e19400271a47c4d7e927bcb7aa95f1bfaf38a9

versions/wmde13/build_metadata_nuke.env

@@ -0,0 +1 @@
+METADATA_NUKE_COMMIT_HASH=af4701d0104ccca93148f31743c35a547897363f

versions/wmde13/build_metadata_oauth.env

@@ -0,0 +1 @@
+METADATA_OAUTH_COMMIT_HASH=1334c21dca3c7184af358e8d6a1c6db3e92d7831

versions/wmde13/build_metadata_quickstatements.env

@@ -0,0 +1 @@
+METADATA_QUICKSTATEMENTS_COMMIT_HASH=c4b2c6b086b319aa32dcdd7a323edf188faaa66d

versions/wmde13/build_metadata_scribunto.env

@@ -0,0 +1 @@
+METADATA_SCRIBUNTO_COMMIT_HASH=b00e5128d17131d73e74e0de4effe747a8d33449

versions/wmde13/build_metadata_syntaxhighlight_geshi.env

@@ -0,0 +1 @@
+METADATA_SYNTAXHIGHLIGHT_GESHI_COMMIT_HASH=9bcbb3105d79fdeba1d7249765e2aef39c693811

versions/wmde13/build_metadata_universallanguageselector.env

@@ -0,0 +1 @@
+METADATA_UNIVERSALLANGUAGESELECTOR_COMMIT_HASH=adc918b1d3643298429c6eb9c146c07b8850d0ec

versions/wmde13/build_metadata_visualeditor.env

@@ -0,0 +1 @@
+METADATA_VISUALEDITOR_COMMIT_HASH=1d1da8cbc84b72d4e09ed0be139b20df5b40b0e9

versions/wmde13/build_metadata_wdqs_frontend.env

@@ -0,0 +1 @@
+METADATA_WDQS_FRONTEND_COMMIT_HASH=4e94cdecec4aaa252465429dc9024b3dcc0056b5

versions/wmde13/build_metadata_wikibase.env

@@ -0,0 +1 @@
+METADATA_WIKIBASE_COMMIT_HASH=59ff291a750bbe409906c3dbfc61e4e13101f67d

versions/wmde13/build_metadata_wikibasecirrussearch.env

@@ -0,0 +1 @@
+METADATA_WIKIBASECIRRUSSEARCH_COMMIT_HASH=4e52782ae1babc7cd77a8e22459e353fc4b0c008

versions/wmde13/build_metadata_wikibaseedtf.env

@@ -0,0 +1 @@
+METADATA_WIKIBASEEDTF_COMMIT_HASH=5596403a27d8e4a5ac044257c49be3e0685318a6

versions/wmde13/build_metadata_wikibaselocalmedia.env

@@ -0,0 +1 @@
+METADATA_WIKIBASELOCALMEDIA_COMMIT_HASH=6dcc6e82526896352b6bae1df11750f378201fcb

versions/wmde13/build_metadata_wikibasemanifest.env

@@ -0,0 +1 @@
+METADATA_WIKIBASEMANIFEST_COMMIT_HASH=a9acda8d9f3e671e30fdf14c00570d1b06a763ab

versions/wmde13/built_versions.log

@@ -0,0 +1,4 @@
+MediaWiki 1.39
+Elasticsearch 7.10.2
+WDQS 0.3.135
+Databases: mariadb:10.9