Re: [Wikitech-l] wmf-deployment branch
On Fri, Jul 17, 2009 at 4:20 AM, Chad wrote: > It already has wmf hacks :) IMHO, its not a branch > outside people should use. > > -Chad > I am using it. I believe this branch was created in part because I have requested it at least 3 times. Please make a branch for outside people to use! ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
It already has wmf hacks :) IMHO, its not a branch outside people should use. -Chad On Jul 17, 2009 1:51 AM, "Tisza Gergő" wrote: Brion Vibber wikimedia.org> writes: > Since we seem to routinely have our deployment li... Will this work for other installations too, or can it contain WMF-specific hacks? ___ Wikitech-l mailing list wikitec...@lists.wikimedia... ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Brion Vibber wikimedia.org> writes: > Since we seem to routinely have our deployment linger a bit behind trunk > but still need to make updates on it, I've gone ahead and created a > branch with out live versions of MediaWiki & extensions on it: > > http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment Will this work for other installations too, or can it contain WMF-specific hacks? ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Now running all sites from the wmf-deployment branch. Had some brief glitches with the scripts that generate robots.txt and the www.wikipedia.org & similar portal pages, as well as the style sheets directory being missing for a couple minutes due to a botched rsync. :) Otherwise seems smooth so far! I'll be merging in some fixes from the Usability team (Vector skin updates and fixes to the new toolbar) shortly, then we'll start updating things in general on a more leisurely schedule. :) -- brion ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Gerard Meijssen wrote: > Hoi, > When the updates for "Wikimedia life" have to go into this new branch, what > is then the status of the trunk? Will all the updates *have* to go into > trunk as well and will they ? Or will trunk suffer from bit rot and > consequently will everyone work on this new branch ? What will be the status > of the extensions NOT used by the WMF ?? When an update to a new release > happens, will trunk and this new branch be merged and how will the effects > on extensions be assessed ??? There is *ABSOLUTELY NO* difference from what has been going on previously, except that the state of our deployment checkout will actually be reproducible and trackable instead of mysterious and opaque. As this is information you frequently ask us to be more open about, I expect you should be happy about it. :) Here's how it works: 1) ALL DEVELOPMENT IS DONE ON TRUNK 2) The wmf-deployment branch contains the snapshot of trunk (plus partial upgrades/downgrades or other temporary hacks) that we're running live. Previously the state of 2) was hidden in our working directory on the servers and could not be reproduced easily when we're in between complete "pure" syncs from trunk. -- brion ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
2009/7/14 Gerard Meijssen : > Hoi, > Almost every day the localisations from translatewiki.net into trunk. This > new branch cannot just these localisations from the trunk SVN because they > can be different. The key question for me is "how is this going to work". I > do not see it. The LocalisationUpdate extension might do the trick ... Using LocalisationUpdate is probably best. Please note that the intention of the new branch is to *reflect* the state of the code running live and to make it easier for ops people to push stuff live (mess around in the branch, commit, update on the servers). The policy concerning pushing changes *will not change* unless a senior dev says so; it is not affected by the introduction of this branch in any way, merely simplified. Roan Kattouw (Catrope) ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Hoi, Almost every day the localisations from translatewiki.net into trunk. This new branch cannot just these localisations from the trunk SVN because they can be different. The key question for me is "how is this going to work". I do not see it. The LocalisationUpdate extension might do the trick ... Thanks, GerardM 2009/7/14 Chad > On Tue, Jul 14, 2009 at 7:30 AM, Gerard > Meijssen wrote: > > Hoi, > > When the updates for "Wikimedia life" have to go into this new branch, > what > > is then the status of the trunk? Will all the updates *have* to go into > > trunk as well and will they ? Or will trunk suffer from bit rot and > > consequently will everyone work on this new branch ? What will be the > status > > of the extensions NOT used by the WMF ?? When an update to a new release > > happens, will trunk and this new branch be merged and how will the > effects > > on extensions be assessed ??? > > > > How will this work ? > > Thanks, > > GerardM > > > > > > 2009/7/14 Brion Vibber > > > >> Since we seem to routinely have our deployment linger a bit behind trunk > >> but still need to make updates on it, I've gone ahead and created a > >> branch with out live versions of MediaWiki & extensions on it: > >> > >> http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment > >> > >> Misc coders: please don't commit to it or we break you. :) > >> > >> > >> With Subversion 1.5 or later on the client, merging updates from trunk > >> should be easier, as SVN now saves merge info into properties and can > >> more intelligently figure out where you last left off. For instance to > >> update the UsabilityInitiative extension to the current version from > trunk: > >> > >> cd extensions/UsabilityInitiative > >> svn merge \ > >> svn+ssh:// > >> > svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/UsabilityInitiative > >> svn commit > >> > >> > >> The theoretical workflow is: > >> * Merge updates that need to go live into branches/wmf-deployment > >> * Test it locally & on staging server (once we've got a nicer staging > >> area set up) > >> * Update deployment master: svn up > >> * Poke live test on test.wikipedia.org > >> * Deploy updates to all servers: scap > >> > >> > >> For the moment I've applied the various 'svn up' and manually merged > >> live patches from our live deployment, with the exception of any > >> _manually added_ files. There's a lot of cruft and I'm not sure yet > >> which of the extra files are ancient one-offs and which we really need. > :) > >> > >> We'll want to test a fresh checkout on test.wikipedia for a bit before > >> syncing live to all wikis. > >> > >> -- brion vibber (brion @ wikimedia.org) > >> > >> ___ > >> Wikitech-l mailing list > >> Wikitech-l@lists.wikimedia.org > >> https://lists.wikimedia.org/mailman/listinfo/wikitech-l > >> > > ___ > > Wikitech-l mailing list > > Wikitech-l@lists.wikimedia.org > > https://lists.wikimedia.org/mailman/listinfo/wikitech-l > > > > This branch isn't where main development goes. Brion clearly laid > out that non-WMF people (ie me and most of the other volunteer > devs) shouldn't touch this branch. All main development continues > on trunk, I don't know why you'd think it would rot. > > The main purpose of this branch is to provide a clearly visible snapshot > of what is running on the WMF cluster. This is never HEAD from trunk, > it's always a bit behind. Some critical bugfixes and hacks get pushed > in. Now we can all see when this happens, instead of just sysadmins. > > I would imagine this new branch would be updated whenever A) code > has been reviewed and needs merging to WMF and B) whenever some > hotfix was put in place. > > Some WMF hacks make it into trunk code because they're generally > helpful. Some do not. > > -Chad > > ___ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l > ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
On Tue, Jul 14, 2009 at 7:30 AM, Gerard Meijssen wrote: > Hoi, > When the updates for "Wikimedia life" have to go into this new branch, what > is then the status of the trunk? Will all the updates *have* to go into > trunk as well and will they ? Or will trunk suffer from bit rot and > consequently will everyone work on this new branch ? What will be the status > of the extensions NOT used by the WMF ?? When an update to a new release > happens, will trunk and this new branch be merged and how will the effects > on extensions be assessed ??? > > How will this work ? > Thanks, > GerardM > > > 2009/7/14 Brion Vibber > >> Since we seem to routinely have our deployment linger a bit behind trunk >> but still need to make updates on it, I've gone ahead and created a >> branch with out live versions of MediaWiki & extensions on it: >> >> http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment >> >> Misc coders: please don't commit to it or we break you. :) >> >> >> With Subversion 1.5 or later on the client, merging updates from trunk >> should be easier, as SVN now saves merge info into properties and can >> more intelligently figure out where you last left off. For instance to >> update the UsabilityInitiative extension to the current version from trunk: >> >> cd extensions/UsabilityInitiative >> svn merge \ >> svn+ssh:// >> svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/UsabilityInitiative >> svn commit >> >> >> The theoretical workflow is: >> * Merge updates that need to go live into branches/wmf-deployment >> * Test it locally & on staging server (once we've got a nicer staging >> area set up) >> * Update deployment master: svn up >> * Poke live test on test.wikipedia.org >> * Deploy updates to all servers: scap >> >> >> For the moment I've applied the various 'svn up' and manually merged >> live patches from our live deployment, with the exception of any >> _manually added_ files. There's a lot of cruft and I'm not sure yet >> which of the extra files are ancient one-offs and which we really need. :) >> >> We'll want to test a fresh checkout on test.wikipedia for a bit before >> syncing live to all wikis. >> >> -- brion vibber (brion @ wikimedia.org) >> >> ___ >> Wikitech-l mailing list >> Wikitech-l@lists.wikimedia.org >> https://lists.wikimedia.org/mailman/listinfo/wikitech-l >> > ___ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l > This branch isn't where main development goes. Brion clearly laid out that non-WMF people (ie me and most of the other volunteer devs) shouldn't touch this branch. All main development continues on trunk, I don't know why you'd think it would rot. The main purpose of this branch is to provide a clearly visible snapshot of what is running on the WMF cluster. This is never HEAD from trunk, it's always a bit behind. Some critical bugfixes and hacks get pushed in. Now we can all see when this happens, instead of just sysadmins. I would imagine this new branch would be updated whenever A) code has been reviewed and needs merging to WMF and B) whenever some hotfix was put in place. Some WMF hacks make it into trunk code because they're generally helpful. Some do not. -Chad ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Hoi, I forgot, how will this affect our localisation and internationalisation ??? What version of MediaWiki is it to support.. it does support trunk and imho that is the right thing.. I seriously do not get it. Thanks, GerardM 2009/7/14 Gerard Meijssen > Hoi, > When the updates for "Wikimedia life" have to go into this new branch, what > is then the status of the trunk? Will all the updates *have* to go into > trunk as well and will they ? Or will trunk suffer from bit rot and > consequently will everyone work on this new branch ? What will be the status > of the extensions NOT used by the WMF ?? When an update to a new release > happens, will trunk and this new branch be merged and how will the effects > on extensions be assessed ??? > > How will this work ? > Thanks, > GerardM > > > 2009/7/14 Brion Vibber > > Since we seem to routinely have our deployment linger a bit behind trunk >> but still need to make updates on it, I've gone ahead and created a >> branch with out live versions of MediaWiki & extensions on it: >> >> http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment >> >> Misc coders: please don't commit to it or we break you. :) >> >> >> With Subversion 1.5 or later on the client, merging updates from trunk >> should be easier, as SVN now saves merge info into properties and can >> more intelligently figure out where you last left off. For instance to >> update the UsabilityInitiative extension to the current version from >> trunk: >> >> cd extensions/UsabilityInitiative >> svn merge \ >> svn+ssh:// >> svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/UsabilityInitiative >> svn commit >> >> >> The theoretical workflow is: >> * Merge updates that need to go live into branches/wmf-deployment >> * Test it locally & on staging server (once we've got a nicer staging >> area set up) >> * Update deployment master: svn up >> * Poke live test on test.wikipedia.org >> * Deploy updates to all servers: scap >> >> >> For the moment I've applied the various 'svn up' and manually merged >> live patches from our live deployment, with the exception of any >> _manually added_ files. There's a lot of cruft and I'm not sure yet >> which of the extra files are ancient one-offs and which we really need. :) >> >> We'll want to test a fresh checkout on test.wikipedia for a bit before >> syncing live to all wikis. >> >> -- brion vibber (brion @ wikimedia.org) >> >> ___ >> Wikitech-l mailing list >> Wikitech-l@lists.wikimedia.org >> https://lists.wikimedia.org/mailman/listinfo/wikitech-l >> > > ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Hoi, When the updates for "Wikimedia life" have to go into this new branch, what is then the status of the trunk? Will all the updates *have* to go into trunk as well and will they ? Or will trunk suffer from bit rot and consequently will everyone work on this new branch ? What will be the status of the extensions NOT used by the WMF ?? When an update to a new release happens, will trunk and this new branch be merged and how will the effects on extensions be assessed ??? How will this work ? Thanks, GerardM 2009/7/14 Brion Vibber > Since we seem to routinely have our deployment linger a bit behind trunk > but still need to make updates on it, I've gone ahead and created a > branch with out live versions of MediaWiki & extensions on it: > > http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment > > Misc coders: please don't commit to it or we break you. :) > > > With Subversion 1.5 or later on the client, merging updates from trunk > should be easier, as SVN now saves merge info into properties and can > more intelligently figure out where you last left off. For instance to > update the UsabilityInitiative extension to the current version from trunk: > > cd extensions/UsabilityInitiative > svn merge \ > svn+ssh:// > svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/UsabilityInitiative > svn commit > > > The theoretical workflow is: > * Merge updates that need to go live into branches/wmf-deployment > * Test it locally & on staging server (once we've got a nicer staging > area set up) > * Update deployment master: svn up > * Poke live test on test.wikipedia.org > * Deploy updates to all servers: scap > > > For the moment I've applied the various 'svn up' and manually merged > live patches from our live deployment, with the exception of any > _manually added_ files. There's a lot of cruft and I'm not sure yet > which of the extra files are ancient one-offs and which we really need. :) > > We'll want to test a fresh checkout on test.wikipedia for a bit before > syncing live to all wikis. > > -- brion vibber (brion @ wikimedia.org) > > ___ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l > ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] wmf-deployment branch
Thanks! On Mon, Jul 13, 2009 at 6:10 PM, Brion Vibber wrote: > Since we seem to routinely have our deployment linger a bit behind trunk > but still need to make updates on it, I've gone ahead and created a > branch with out live versions of MediaWiki & extensions on it: > > http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment > > Misc coders: please don't commit to it or we break you. :) > > > With Subversion 1.5 or later on the client, merging updates from trunk > should be easier, as SVN now saves merge info into properties and can > more intelligently figure out where you last left off. For instance to > update the UsabilityInitiative extension to the current version from trunk: > > cd extensions/UsabilityInitiative > svn merge \ > svn+ssh:// > svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/UsabilityInitiative > svn commit > > > The theoretical workflow is: > * Merge updates that need to go live into branches/wmf-deployment > * Test it locally & on staging server (once we've got a nicer staging > area set up) > * Update deployment master: svn up > * Poke live test on test.wikipedia.org > * Deploy updates to all servers: scap > > > For the moment I've applied the various 'svn up' and manually merged > live patches from our live deployment, with the exception of any > _manually added_ files. There's a lot of cruft and I'm not sure yet > which of the extra files are ancient one-offs and which we really need. :) > > We'll want to test a fresh checkout on test.wikipedia for a bit before > syncing live to all wikis. > > -- brion vibber (brion @ wikimedia.org) > > ___ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l > ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
[Wikitech-l] wmf-deployment branch
Since we seem to routinely have our deployment linger a bit behind trunk but still need to make updates on it, I've gone ahead and created a branch with out live versions of MediaWiki & extensions on it: http://svn.wikimedia.org/svnroot/mediawiki/branches/wmf-deployment Misc coders: please don't commit to it or we break you. :) With Subversion 1.5 or later on the client, merging updates from trunk should be easier, as SVN now saves merge info into properties and can more intelligently figure out where you last left off. For instance to update the UsabilityInitiative extension to the current version from trunk: cd extensions/UsabilityInitiative svn merge \ svn+ssh://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/UsabilityInitiative svn commit The theoretical workflow is: * Merge updates that need to go live into branches/wmf-deployment * Test it locally & on staging server (once we've got a nicer staging area set up) * Update deployment master: svn up * Poke live test on test.wikipedia.org * Deploy updates to all servers: scap For the moment I've applied the various 'svn up' and manually merged live patches from our live deployment, with the exception of any _manually added_ files. There's a lot of cruft and I'm not sure yet which of the extra files are ancient one-offs and which we really need. :) We'll want to test a fresh checkout on test.wikipedia for a bit before syncing live to all wikis. -- brion vibber (brion @ wikimedia.org) ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
