wmde · rti · Nov 28, 2023 · Nov 8, 2023 · Nov 8, 2023 · Nov 9, 2023
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -160,7 +160,7 @@ jobs:
           # Latest 1.38
           'wmde.12',
           # Latest 1.39
-          'wmde.11',
+          'wmde.13',
         ]
     needs:
       - build
@@ -209,7 +209,7 @@ jobs:
           # Latest 1.38
           'wmde.12-bundle',
           # Latest 1.39
-          'wmde.11-bundle',
+          'wmde.13-bundle',
         ]
 
     env:

diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,21 @@ 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.
 
+
+## November 2023: First 1.40 release
+
+- [MediaWiki release announcement 1.40](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/H46H5ZYZG2PYUQ5STK7NWKF7GXYW7H6B/)
+- [MediaWiki security and maintenance release announcement: 1.35.12 / 1.39.5 / 1.40.1](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/BRWOWACCHMYRIS7JRTT6XD44X3362MVL/)
+
+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.40)
+- [Wikibase release notes](https://github.com/wikimedia/Wikibase/blob/REL1_40/RELEASE-NOTES-1.40)
+
+| Suite Version | Version Info | Date available | Run number | Release task  |
+|---------------|----------------------|----------------|------------| --------------|
+| wmde.14 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.14/variables.env)) | MediaWiki (1.40.1, PHP 8.1.25), WDQS (0.3.135)    | 15 November 2023 | [6928788894](https://github.com/wmde/wikibase-release-pipeline/actions/runs/6928788894) | [T340939](https://phabricator.wikimedia.org/T340939) |
+
 ## October 2023: Security releases for 1.39.5
 
 - [Maintenance release: MediaWiki 1.39.2](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/UJBH5OGW5M5Q22KETIQY4MV2Q6XJPQWG/)

diff --git a/Docker/publish/upload_tar/publish.sh b/Docker/publish/upload_tar/publish.sh
@@ -11,7 +11,7 @@ if [ -z "$RELEASE_HOST" ] || \
     exit 1;
 fi
 
-ARTIFACT_PATH=/extractedArtifacts/BuildArtifacts
+ARTIFACT_PATH=/extractedArtifacts/TarBalls
 RELEASE_FULL_PATH=$RELEASE_DIR/$RELEASE_MAJOR_VERSION
 
 # Setup ssh-keys

diff --git a/docs/topics/publishing.md b/docs/topics/publishing.md
@@ -83,7 +83,7 @@ Remove locally created artifacts and use the downloaded ones
 
 ```
 $ make clean
-$ cp artifacts/WORKFLOW_RUN_NUMBER/BuildArtifacts/* artifacts/
+$ cp artifacts/WORKFLOW_RUN_NUMBER/DockerImages/* artifacts/
 $ make test SUITE=<suite-name>
 ```
 

diff --git a/docs/topics/test-system.md b/docs/topics/test-system.md
@@ -130,16 +130,16 @@ sudo docker compose -f docker-compose.yml -f docker-compose.extra.yml start wdqs
 
 The service should now be up and running!
 
-## Using images from BuildArtifacts
+## Using images from built artifacts
 
-You load images from tar files that are part of `BuildArtifacts` for any Github run.
+You load images from tar files that are in `DockerImages` for any Github run.
 
 Firstly, find the run summary that you want to load, such as https://github.com/wmde/wikibase-release-pipeline/actions/runs/3446873839.
 
-When authenticated using the `gh` CLI tool, you can download `BuildArtifacts` of any run using the run ID.
+When authenticated using the `gh` CLI tool, you can download `DockerImages` of any run using the run ID.
 
 ```sh
-gh run download 3446873839 -n BuildArtifacts -R wmde/wikibase-release-pipeline
+gh run download 3446873839 -n DockerImages -R wmde/wikibase-release-pipeline
 ```
 
 Once downloaded you can load the compressed images and delete the artifacts from disk in a quick loop.

diff --git a/example/template.env b/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.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
+WIKIBASE_IMAGE_NAME=wikibase/wikibase:1.40.1-wmde.14
+WDQS_IMAGE_NAME=wikibase/wdqs:0.3.135-wmde.14
+WDQS_FRONTEND_IMAGE_NAME=wikibase/wdqs-frontend:wmde.14
+ELASTICSEARCH_IMAGE_NAME=wikibase/elasticsearch:7.10.2-wmde.14
+WIKIBASE_BUNDLE_IMAGE_NAME=wikibase/wikibase-bundle:1.40.1-wmde.14
+QUICKSTATEMENTS_IMAGE_NAME=wikibase/quickstatements:wmde.14
+WDQS_PROXY_IMAGE_NAME=wikibase/wdqs-proxy:wmde.14
 MYSQL_IMAGE_NAME=mariadb:10.9
 
 ## Mediawiki Configuration

diff --git a/publish/docker-compose.yml b/publish/docker-compose.yml
@@ -16,13 +16,13 @@ services:
       dockerfile: Dockerfile
     privileged: true
     environment:
-      - ELASTICSEARCH_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/elasticsearch.docker.tar.gz
-      - WIKIBASE_BUNDLE_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/wikibase-bundle.docker.tar.gz
-      - WIKIBASE_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/wikibase.docker.tar.gz
-      - WDQS_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/wdqs.docker.tar.gz
-      - WDQS_FRONTEND_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/wdqs-frontend.docker.tar.gz
-      - QUICKSTATEMENTS_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/quickstatements.docker.tar.gz
-      - WDQS_PROXY_DOCKER_PATH=/extractedArtifacts/BuildArtifacts/wdqs-proxy.docker.tar.gz
+      - ELASTICSEARCH_DOCKER_PATH=/extractedArtifacts/DockerImages/elasticsearch.docker.tar.gz
+      - WIKIBASE_BUNDLE_DOCKER_PATH=/extractedArtifacts/DockerImages/wikibase-bundle.docker.tar.gz
+      - WIKIBASE_DOCKER_PATH=/extractedArtifacts/DockerImages/wikibase.docker.tar.gz
+      - WDQS_DOCKER_PATH=/extractedArtifacts/DockerImages/wdqs.docker.tar.gz
+      - WDQS_FRONTEND_DOCKER_PATH=/extractedArtifacts/DockerImages/wdqs-frontend.docker.tar.gz
+      - QUICKSTATEMENTS_DOCKER_PATH=/extractedArtifacts/DockerImages/quickstatements.docker.tar.gz
+      - WDQS_PROXY_DOCKER_PATH=/extractedArtifacts/DockerImages/wdqs-proxy.docker.tar.gz
 
       - WDQS_IMAGE_NAME
       - WDQS_FRONTEND_IMAGE_NAME

diff --git a/publish/tar-nodocker.sh b/publish/tar-nodocker.sh
@@ -9,7 +9,7 @@ if [ -z "$RELEASE_HOST" ] || \
     exit 1;
 fi
 
-ARTIFACT_PATH=./artifacts/$WORKFLOW_RUN_NUMBER/BuildArtifacts
+ARTIFACT_PATH=./artifacts/$WORKFLOW_RUN_NUMBER/TarBalls
 RELEASE_FULL_PATH=$RELEASE_DIR/$RELEASE_MAJOR_VERSION
 
 echo "Will upload tarballs from $ARTIFACT_PATH to $RELEASE_HOST at $RELEASE_FULL_PATH"

diff --git a/test/suites/upgrade/old-versions/wmde.13-bundle.env b/test/suites/upgrade/old-versions/wmde.13-bundle.env
@@ -0,0 +1 @@
+WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase-bundle:1.39.5-wmde.13
diff --git a/test/suites/upgrade/old-versions/wmde.13.env b/test/suites/upgrade/old-versions/wmde.13.env
@@ -0,0 +1 @@
+WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase:1.39.5-wmde.13
diff --git a/variables.env b/variables.env
@@ -10,28 +10,28 @@ MEDIAWIKI_VERSION=1.40.1
 RELEASE_MAJOR_VERSION=1.40
 RELEASE_VERSION=1.40.1
 
-# WDQS_VERSION 0.3.135 is latest release on 2023-10-11
+# WDQS_VERSION 0.3.135 is latest release on 2023-10-15
 # 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
+# Head of master on 2023-11-09
 # as per https://github.com/wikimedia/wikidata-query-gui/
-WDQS_FRONTEND_COMMIT_HASH=4e94cdecec4aaa252465429dc9024b3dcc0056b5
+WDQS_FRONTEND_COMMIT_HASH=eb1825b3431f3adf47cd774bf52344024e2f11e9
 
-# Head of master on 2023-10-11
+# Head of master on 2023-11-09
 # as per https://github.com/magnusmanske/quickstatements/commits/master
 QUICKSTATEMENTS_COMMIT_HASH=c4b2c6b086b319aa32dcdd7a323edf188faaa66d
 
-# Head of master on 2023-10-11
+# Head of master on 2023-11-09
 # as per https://bitbucket.org/magnusmanske/magnustools/commits/branch/master
-MAGNUSTOOLS_COMMIT_HASH=11e19400271a47c4d7e927bcb7aa95f1bfaf38a9
+MAGNUSTOOLS_COMMIT_HASH=e4abdb6b3bedfdde0325df513b272e1972b1af36
 
-# Head of master on 2023-10-11
+# Head of master on 2023-11-15 (including fix for deprecation warning on 1.40)
 # as per https://github.com/ProfessionalWiki/WikibaseLocalMedia/tree/master
-WIKIBASELOCALMEDIA_COMMIT_HASH=6dcc6e82526896352b6bae1df11750f378201fcb
+WIKIBASELOCALMEDIA_COMMIT_HASH=74c3f70893ffd76feefa9f1e3d77052db20ec3ac
 
-# Head of master on 2023-10-11
+# Head of master on 2023-11-09
 # as per https://github.com/ProfessionalWiki/WikibaseEdtf/tree/master
 WIKIBASEEDTF_COMMIT_HASH=5596403a27d8e4a5ac044257c49be3e0685318a6
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		WIKIBASE_SOURCE_IMAGE_NAME=wikibase/wikibase-bundle:1.39.5-wmde.13