While individual extensions and skins have REL1_35 branches, the skins and extensions meta repos don't have a REL1_35 branch
Description
Related Objects
- Mentioned In
- T351341: Delete REL* branches from mediawiki/extensions and mediawiki/skins
T313920: Branch REL1_39 for MediaWiki and all extensions and skins - Mentioned Here
- rMRELf17b9beca72c: Provide `branch-version.py` for tarball release branching
T232024: Branch REL1_34 for MediaWiki and deployed extensions
rMEXTd1ce1a72cda2: Updated mediawiki/extensions Project: mediawiki/extensions/CirrusSearch…
rMEXT051f9ccbfa2f: Creating new REL1_27 branch
rSKIN008047d3f734: Creating new REL1_27 branch
rSKINa86d9bd34078: Updated git submodules
rMEXTa61ab94ad03c: Updated git submodules
rSKIN4e51c229936d: Update git submodules
rMEXTe87f858fe136: Update git submodules
rSKIN1690300693c9: Update git submodules
rMEXT098000be138c: Update git submodules
rSKINc0e98913c79b: Update git submodules
rMEXTd2522d5527e5: Update git submodules
rSKINf7d963be0ce7: Update git submodules
rMEXT000188551b6d: Update git submodules
rMEXTd783f0d64c34: Remove Configure ext
rSKINe856d2a22163: Update git submodules
rSKIN5d6d17886cee: Update git submodules
rMEXTd91c77593de5: Update git submodules
T351341: Delete REL* branches from mediawiki/extensions and mediawiki/skins
rMEXT7ab9a74c9ebb: Update git submodules
rSKIN796693cb7a2e: Update git submodules
Event Timeline
Mentioned in SAL (#wikimedia-operations) [2020-10-01T21:29:28Z] <James_F> Manually created mediawiki/skins.git REL1_35 at 796693cb7a2ee3191fcbe19769d341bd0530bd4a for T264365
Mentioned in SAL (#wikimedia-operations) [2020-10-01T22:36:01Z] <James_F> Manually created mediawiki/extensions.git REL1_35 at 7ab9a74c9ebbb22ad9fb9b7c95c91b7fad8bf8c6 for T264365
(This is still open because @Reedy wanted to work out why the script didn't do this automatically like it used to, and fix it so that it does do so again for REL1_36.)
Tagging the RelEng team for visibility.
Given the magic-updating sub-repo tech is gerrit-specific and we won't have it for GitLab, is it worth fixing this just for it to break in a few months' time?
This would conflict with T351341: Delete REL* branches from mediawiki/extensions and mediawiki/skins
I went digging at the reference logs on the Gerrit server for each of the super projects which are in files /srv/gerrit/git/mediawiki/{extensions,skins}.git/logs/refs/heads/REL* which after editing gives me:
mediawiki/extensions
REL1_23 | d1ce1a72cda2be82a0a6e1ed4ef61b665042b601 | MarkAHershberger <mah> | 1398101891 +0000 | push: created |
REL1_27 | 051f9ccbfa2f51f9c8b812224ed1d646c6a907a4 | Chad <demon> | 1462389668 +0000 | push: created |
REL1_28 | a61ab94ad03c357091b2d5359bb529b1b56c31d2 | Chad <demon> | 1477432963 +0000 | created via REST from HEAD |
REL1_29 | e87f858fe13627b6bbedf19ffec9c484333e27a1 | Chad <demon> | 1493317892 +0000 | created via REST from HEAD |
REL1_30 | 098000be138ce2d7d1db996e123193dfd4d609eb | Chad <demon> | 1505937026 +0000 | created via REST from HEAD |
REL1_31 | d2522d5527e52c9c356258e8ed253ec740643581 | Chad <demon> | 1523998433 +0000 | created via REST from HEAD |
REL1_32 | 000188551b6d4f79f207f57240905c7abc87ca39 | 20after4 <twentyafterfour> | 1539727946 +0000 | created via REST from master |
REL1_33 | d783f0d64c341e4efb9497abf10aaa8d4fd364c3 | Jforrester <jforrester> | 1558259113 +0000 | created via REST from d783f0d64c341e4efb9497abf10aaa8d4fd364c3 |
REL1_34 | d91c77593de5e1f4484ba21fa762c7b991e7a442 | Dduvall <dduvall> | 1570215384 +0000 | created via REST from master |
mediawiki/skins
REL1_27 | 008047d3f734d8b70765447f8a647be89187c48d | Chad <demon> | 1462407956 +0000 | push: created |
REL1_28 | a86d9bd340782b2c994dbac15089dc572ff3cbd5 | Chad <demon> | 1477432908 +0000 | created via REST from HEAD |
REL1_29 | 4e51c229936d9f257a0b48cd660d40ed97269835 | Chad <demon> | 1493317819 +0000 | created via REST from HEAD |
REL1_30 | 1690300693c990082e4bcd5b9413c595b6425a91 | Chad <demon> | 1505936955 +0000 | created via REST from HEAD |
REL1_31 | c0e98913c79bc74266876d11eddb0744b7c65a5b | Chad <demon> | 1523998411 +0000 | created via REST from HEAD |
REL1_32 | f7d963be0ce79633d299e61f223178a150621392 | 20after4 <twentyafterfour> | 1539727859 +0000 | created via REST from master |
REL1_33 | e856d2a221639931725405286c57106b5d35ef3d | Jforrester <jforrester> | 1558259241 +0000 | created via REST from e856d2a221639931725405286c57106b5d35ef3d |
REL1_34 | 5d6d17886ceecfe9b5775bbe9689617b6665422c | Dduvall <dduvall> | 1570215365 +0000 | created via REST from master |
So we originally created the branch by doing a direct push.
Since REL1_28 / Oct 25th 2016, we have been using the Gerrit REST API.
REL1_34 got created on October 4th 2019.
I am guessing the branch cut was done by one of the make-release scripts from https://gitlab.wikimedia.org/repos/releng/release.git . After digging in the code I eventually found the root cause f17b9beca72c15aaf5a0ff69dfead25e288afdb6 by @dduvall (which was done for REL1_34 branching T232024). The commit has:
Fixed some issues with retrieval of skins/extensions from Gerrit where collection repos such as mediawiki/extensions and mediawiki/skins were being included as well as repos beneath the project structure of extensions (e.g. mediawiki/extensions/Parsoid/cpp/contrib/libhubbub).
Which to me implies the super projects got removed on purpose. The code previously had:
for stuff in ['skins', 'extensions']: projects = _get_client().get( '/projects/?p=mediawiki/%s&b=%s' % (stuff, branch)) for proj in projects: if projects[proj]['state'] == 'ACTIVE': things_to_branch.append(proj)
Which included the superproject, the commit changed the get query to append an extra / after stuff which got rid of mediawiki/extensions and mediawiki/skins super project.
I think that explains why the release branches are no more applied.
Given:
- last release branch cut for mediawiki/extensions and mediawiki/skins was REL1_35
- REL1_35 is no more supported (as of December 2023)
- nobody complained about the lack of those release branches over the last four years
I propose, for the two super projects, to convert the existing REL branches to tags. That would fulfill my original request at T351341: Delete REL* branches from mediawiki/extensions and mediawiki/skins.