Skip to content

Commit e8744b2

Browse files
authored
Prepare wmde.9 (1.37) (#357)
* Use 1.35.7 for wmde.7 * Remove newline at end of wmde.7 env file * Update WDQS_FRONTEND_COMMIT_HASH This includes mostly bumps of packages and a few minor fixes to things. Nothing users need to worry about in terms of an upgrade, but useful (probably) for them to have) * Bump commits for some other released things... * Add docs for security releasing (that I used) * Add sec-release docs to index * wdqs-ui 69ec53f45fdaf7119a3e4bd2845adbcffe24a515 * Start wmde.8 * Start wmde.9 which would be 1.37 * Add CHANGES.md for 1.37 rel * Update CI test versions * Update versions again * Poke less wdqs-gui deps * Use fixed wdqs package-lock.json * Update test/upgrade env files for new tests * Add more details to CHANGES.md * Remove more old-versions tests * Add error reporting to client part of repo_client test This is already in the repo settings file, but missing from client. This will make debugging easier... * Output MediaWiki logs in CI too * Define entitySources for client test * Disable fed props tests for now * Revert "Output MediaWiki logs in CI too" This reverts commit 2c62a55. * Disable fedprops tests in more places * Revert "Revert "Output MediaWiki logs in CI too"" This reverts commit 650f78a. * More general path for mwlog output * Revert "More general path for mwlog output" This reverts commit 7f739d1. * Revert "Revert "Revert "Output MediaWiki logs in CI too""" This reverts commit a6091a0. * Add wgWBClientSettings['itemAndPropertySourceName'] * Try outputting mw logs again * Poke the logging again... * mwlog, more ls output, and no / * mwlogs, continue on error & cleaner ls output * debug logging of mw in tests * Use assert.strictEqual in tests * Fix test: entityschema.js * Use assert package consistently * Try mw-content-text for edit page content It looks like some things have changed around a bit in core, and the old body id that was used now returns more text. mw-content-text is another element within that old body that removes some of this text (mainly links) Extra text was Jump to navigation\nJump to search\n\n before the actual page content. * Use 1.37.6 * mariadb:10.9 * $ is webdriver, not jqeury /o\ * Use assert.deepStrictEqual * Poke interwiki name and source name * Update WikibaseLocalMedia This includes ProfessionalWiki/WikibaseLocalMedia#18 * 1.0.2 of WikibaseLocalMedia * Delete already disabled feddy props tests for now * Change CHANGES to trigger rebuild
1 parent 6b76b25 commit e8744b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+198
-345
lines changed

.github/workflows/built_and_test.yml

+17-15
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
- 'README.md'
1717

1818
env:
19-
env_file: ${{ github.event.inputs.env_file || 'versions/wmde8.env' }}
19+
env_file: ${{ github.event.inputs.env_file || 'versions/wmde9.env' }}
2020

2121
jobs:
2222

@@ -446,10 +446,9 @@ jobs:
446446
strategy:
447447
fail-fast: false
448448
matrix:
449-
databaseImageName: [ 'mariadb:10.3' ] # 'mysql:5.6' disabled https://phabricator.wikimedia.org/T296066
449+
databaseImageName: [ 'mariadb:10.9' ] # 'mysql:5.6' disabled https://phabricator.wikimedia.org/T296066
450450
suite: [
451451
repo,
452-
fedprops,
453452
repo_client,
454453
quickstatements,
455454
pingback,
@@ -459,7 +458,6 @@ jobs:
459458
base__repo,
460459
base__repo_client,
461460
base__pingback,
462-
base__fedprops,
463461
]
464462
needs:
465463
- build_wikibase_bundle
@@ -494,6 +492,13 @@ jobs:
494492
if: always()
495493
run: test/docker_logs.sh
496494

495+
- name: mediawiki logs
496+
if: always()
497+
continue-on-error: true
498+
run: |
499+
ls -lahr test/mwlog test/mwlog/*
500+
tail -n +1 test/mwlog/*/*.log
501+
497502
- name: Archive docker test artifacts
498503
uses: actions/upload-artifact@v3
499504
if: always()
@@ -507,14 +512,10 @@ jobs:
507512
fail-fast: false
508513
matrix:
509514
version: [
510-
'1.32-base',
511-
'1.33-base',
512-
'1.34-base',
513-
'1.35-base',
514-
'wmde.0',
515-
'wmde.1',
516-
'wmde.2',
517-
'wmde.3'
515+
# Latest 1.35
516+
'wmde.7',
517+
# Latest 1.36
518+
'wmde.8',
518519
]
519520
needs:
520521
- build_wikibase
@@ -550,9 +551,10 @@ jobs:
550551
fail-fast: false
551552
matrix:
552553
version: [
553-
'wmde.1-bundle',
554-
'wmde.2-bundle',
555-
'wmde.3-bundle',
554+
# Latest 1.35
555+
'wmde.7-bundle',
556+
# Latest 1.36
557+
'wmde.8-bundle',
556558
]
557559
needs:
558560
- build_wikibase_bundle

.github/workflows/test.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
databaseImageName: [ 'mariadb:10.3' ] # 'mysql:5.6' disabled https://phabricator.wikimedia.org/T296066
20+
databaseImageName: [ 'mariadb:10.9' ] # 'mysql:5.6' disabled https://phabricator.wikimedia.org/T296066
2121
suite: [
2222
repo,
23-
fedprops,
2423
repo_client,
2524
quickstatements,
2625
pingback,
@@ -30,7 +29,6 @@ jobs:
3029
base__repo,
3130
base__repo_client,
3231
base__pingback,
33-
base__fedprops,
3432
]
3533
runs-on: ubuntu-latest
3634
timeout-minutes: 30

CHANGES.md

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ This file is only intended to serve the developers of this repository and of the
44

55
This provides an overview of the releases that have been made using this release pipeline.
66

7+
## IN DEVELOPMENT October 2022: First 1.37 release
8+
9+
The [standard MediaWiki upgrade process](https://www.mediawiki.org/wiki/Manual:Upgrading) can be followed for this release.
10+
11+
- [MediaWiki release notes](https://www.mediawiki.org/wiki/Release_notes/1.37)
12+
- [Wikibase release notes](https://github.com/wikimedia/Wikibase/blob/REL1_37/RELEASE-NOTES-1.37)
13+
14+
The Query service was also updated from `0.3.97` to `0.3.115`, but no additional upgrade process is needed.
15+
16+
| Suite Version | Version Info | Date availbile | Run number | Release task |
17+
|---------------|----------------------|----------------|------------| --------------|
18+
| wmde.9 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.9/versions/wmde9.env),[metadata](https://github.com/wmde/wikibase-release-pipeline/blob/main/versions/wmde9)) | MediaWiki (1.37.6, PHP 7.4.30), WDQS (0.3.115) | TODO | [TODO](https://github.com/wmde/wikibase-release-pipeline/actions/runs/TODO) | [T317890](https://phabricator.wikimedia.org/T317890) |
19+
720
## September 2022: Security releases
821

922
| Suite Version | MediaWiki release | Date availbile | Run number | Release task |

Docker/build/WDQS-frontend/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ RUN apk --no-cache add --virtual build-dependencies ca-certificates git jq make
1717

1818
# TODO do npm build instead of leaving any dev node modules hanging around
1919
RUN mv package.json package.json.orig \
20-
&& jq 'delpaths([["devDependencies","karma-qunit"],["devDependencies","qunitjs"],["devDependencies","sinon"]])' \
21-
> package.json < package.json.orig \
22-
&& jq 'setpath(["devDependencies","less"]; "~2.7.1")' \
20+
&& jq 'delpaths([["devDependencies","karma-qunit"],["devDependencies","sinon"]])' \
2321
> package.json < package.json.orig \
2422
&& npm install \
2523
&& npm run build

Docker/build/Wikibase/LocalSettings.php.REL1_35.template

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ${DOLLAR}wgDebugLogGroups = array(
2121
'resourceloader' => '/var/log/mediawiki/resourceloader.log',
2222
'exception' => '/var/log/mediawiki/exception.log',
2323
'error' => '/var/log/mediawiki/error.log',
24+
'fatal' => '/var/log/mediawiki/fatal.log',
2425
);
2526

2627
## Site Settings

Docker/build/Wikibase/LocalSettings.php.template

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ${DOLLAR}wgDebugLogGroups = array(
2121
'resourceloader' => '/var/log/mediawiki/resourceloader.log',
2222
'exception' => '/var/log/mediawiki/exception.log',
2323
'error' => '/var/log/mediawiki/error.log',
24+
'fatal' => '/var/log/mediawiki/fatal.log',
2425
);
2526

2627
## Site Settings

Docker/test/selenium/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The behavior of the tests can be modified with several environment variables.
6363
When working on the browser tests,
6464
you’ll want to consult the documentation of the following libraries we use:
6565

66-
* [WebdriverIO](http://webdriver.io/api.html) for controlling the browser
66+
* [WebdriverIO](https://webdriver.io/docs/api) for controlling the browser
6767
(`browser`, `$`, `waitForVisible`, …)
6868
* [Mocha](https://mochajs.org/) as the general testing framework
6969
(`describe`, `it`, `before`, …)

Docker/test/selenium/helpers/default-functions.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ const defaultFunctions = function () {
133133

134134
browser.pause( 2 * 1000 );
135135

136-
$( '#bodyContent' ).waitForDisplayed();
137-
return $( '#bodyContent' ).getText();
136+
$( '#mw-content-text' ).waitForDisplayed();
137+
return $( '#mw-content-text' ).getText();
138138
} );
139139

140140
/**
@@ -150,7 +150,7 @@ const defaultFunctions = function () {
150150
const changes = result.data.query.recentchanges;
151151
const foundResult = _.find( changes, expectedChange );
152152

153-
assert( result.status === 200 );
153+
assert.strictEqual( result.status, 200 );
154154

155155
if ( !foundResult ) {
156156
console.error( 'Could not find:' );

Docker/test/selenium/specs/confirm_edit/confirm-edit.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const { assert } = require( 'console' );
3+
const assert = require( 'assert' );
44

55
describe( 'ConfirmEdit', function () {
66

@@ -13,7 +13,7 @@ describe( 'ConfirmEdit', function () {
1313
'paris'
1414
);
1515

16-
assert( executionResult === 'something great' );
16+
assert.strictEqual( executionResult, 'something great' );
1717

1818
} );
1919

Docker/test/selenium/specs/elasticsearch/elasticsearch.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const { assert } = require( 'console' );
3+
const assert = require( 'assert' );
44
const Util = require( 'wdio-mediawiki/Util' );
55
const WikibaseApi = require( 'wdio-wikibase/wikibase.api' );
66

@@ -37,7 +37,7 @@ describe( 'ElasticSearch', function () {
3737
// alias should be visible on item page
3838
$( '.wikibase-aliasesview-list-item' ).waitForDisplayed();
3939
const alias = $( '.wikibase-aliasesview-list-item' ).getText();
40-
assert( alias === itemAlias );
40+
assert.strictEqual( alias, itemAlias );
4141
} );
4242

4343
it( 'should be able to search case-insensitive', async function () {

Docker/test/selenium/specs/fedprops/item.js

-119
This file was deleted.

0 commit comments

Comments
 (0)