Page MenuHomePhabricator

Branch REL1_38 for MediaWiki and all extensions and skins
Closed, ResolvedPublic

Description

  1. ./branch.py REL1_38 --bundle base --branchpoint master (branch tarball extensions and skins)
  2. ./branch.py REL1_38 --core --branchpoint master --core-version 1.38.0-beta --task T302909 (branch MW itself and make a sub-module commit)
  3. ./branch.py REL1_38 --bundle '*' --branchpoint master --core-version 1.38.0 (branch all other extensions and skins)

Event Timeline

Nominally scheduled as https://wikitech.wikimedia.org/wiki/Deployments#deploycal-item-20220315T0200 and self-assigned; happy to pair with someone else who's around at that time and wants to watch/help out.

Change 770658 had a related patch set uploaded (by Jforrester; author: Jforrester):

[mediawiki/core@master] Prepare active branch following REL1_38 cut, labelling as 1.39-alpha

https://gerrit.wikimedia.org/r/770658

Change 770662 had a related patch set uploaded (by Jforrester; author: Jforrester):

[mediawiki/core@REL1_38] Branch commit for REL1_38

https://gerrit.wikimedia.org/r/770662

jforrester@deploy1002:~/release-tools/make-release$ date
Tue 15 Mar 2022 02:08:09 AM UTC
jforrester@deploy1002:~/release-tools/make-release$ git log --oneline -n1
e0b5253 (HEAD -> master, origin/master) deployment-calendar: use yaml rather than json
jforrester@deploy1002:~/release-tools/make-release$ ./branch.py REL1_38 --bundle base --branchpoint master
Branching mediawiki/extensions/AbuseFilter to REL1_38 from master
Branching mediawiki/extensions/CategoryTree to REL1_38 from master
Branching mediawiki/extensions/Cite to REL1_38 from master
Branching mediawiki/extensions/CiteThisPage to REL1_38 from master
Branching mediawiki/extensions/CodeEditor to REL1_38 from master
[…]
Branching mediawiki/skins/MinervaNeue to REL1_38 from master
Branching mediawiki/skins/MonoBook to REL1_38 from master
Branching mediawiki/skins/Timeless to REL1_38 from master
Branching mediawiki/skins/Vector to REL1_38 from master
Branching mediawiki/vendor to REL1_38 from master
jforrester@deploy1002:~/release-tools/make-release$ ./branch.py REL1_38 --core --branchpoint master --core-version 1.38.0-beta --task T302909
Branching mediawiki/core to REL1_38 from master
[…]
remote: Resolving deltas: 100% (5/5)
remote: Processing changes: refs: 1, new: 1, done
remote:
remote: SUCCESS
remote:
remote:   https://gerrit.wikimedia.org/r/c/mediawiki/core/+/770662 Branch commit for REL1_38 [NEW]
remote:
To ssh://gerrit.wikimedia.org:29418/mediawiki/core
 * [new branch]            HEAD -> refs/for/REL1_38
jforrester@deploy1002:~/release-tools/make-release$ ./branch.py REL1_38 --bundle '*' --branchpoint master --core-version 1.38.0
Branching mediawiki/skins/Amethyst to REL1_38 from master
Branching mediawiki/skins/Anisa to REL1_38 from master
Branching mediawiki/skins/BlueSky to REL1_38 from master
Branching mediawiki/skins/BlueSpiceCalumma to REL1_38 from master
[…]
Branching mediawiki/extensions/examples to REL1_38 from master
Branching mediawiki/extensions/googleAnalytics to REL1_38 from master
Branching mediawiki/extensions/intersection to REL1_38 from master
Branching mediawiki/extensions/timeline to REL1_38 from master
Branching mediawiki/extensions/wikihiero to REL1_38 from master
jforrester@deploy1002:~/release-tools/make-release$ date
Tue 15 Mar 2022 02:13:18 AM UTC

Change 770658 merged by jenkins-bot:

[mediawiki/core@master] Prepare active branch following REL1_38 cut, labelling as 1.39-alpha

https://gerrit.wikimedia.org/r/770658

Change 770662 merged by jenkins-bot:

[mediawiki/core@REL1_38] Branch commit for REL1_38

https://gerrit.wikimedia.org/r/770662

Nominally scheduled as https://wikitech.wikimedia.org/wiki/Deployments#deploycal-item-20220315T0200 and self-assigned; happy to pair with someone else who's around at that time and wants to watch/help out.

Sorry I missed this last week. Could you confirm that T302909#7776446 is the complete input/output of this session?

Notes from meeting with James et al about this process:

  • code failed php8 which are running on release branches.
  • Sam and James made fixes in about an hour and half
  • vendor repo has to be slimmed down by hand
    • diffing against rel1_37
    • remembering what was added
  • w/o experience everything would have still worked except for an outstanding patch.
  • need a canonical list of why each vendor library is there so they can be slimmed down properly.
  • idea: explicitly tagging who put library in vendor would help.
  • php version mismatch is an ongoing pain point, but 7.2 is particularly egregious.