[01:17:24] legoktm: If you're ok with the CI approach on https://gerrit.wikimedia.org/r/c/mediawiki/core/+/461696/, could you drop a comment to that effect on the task? Thanks. [02:16:17] Cool. Remember that we’re now merging code into the last 1.32 train. [02:20:14] * MaxSem weeps about poor 1.32 having to support HHVM [15:07:56] Hello. We merged a core change, but neglected to merge changes to one affected extension (Flow). This has caused some sadness. The Flow change is on master as of about 12 hours ago, but I understand that it needs to go to production as well. https://phabricator.wikimedia.org/T203424#4638302 [15:08:15] As a newer team member, I'm not quite sure how I'm supposed to do that. Advice [15:08:22] would be appreciated [15:11:08] bpirkle, it'll need to be backported to the appropriate wmf/* branches [15:11:43] you go to the commit in gerrit and click the cherry-pick button, fill in the branch name [15:12:13] which will be... 1.32.0-wmf.24 [15:13:32] well, wmf/1.32.0-wmf.24 [15:14:16] then (IIRC) when that gets merged, gerrit should update the submodule for the extension in the mediawiki/core repo's branch of the same name [15:14:34] then a deployer goes and pushes it out [15:16:09] Yup, that sounds about right to me :) [15:16:23] bpirkle: And there's a swat window in 43 minutes [15:16:25] So perfect timing :) [15:16:54] You need to add yourself and the patch in the right place on https://wikitech.wikimedia.org/wiki/Deployments [15:17:23] Thank you! I did the cherry-pick: https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Flow/+/464167. So now someone has to +2 it? [15:17:25] I'd suggest installing the browser extension too before hand if you don't have it already [15:17:25] https://wikitech.wikimedia.org/wiki/X-Wikimedia-Debug#Browser_extensions [15:17:42] Generally the SWAT-er will CR+2 it for you before they deploy it [15:18:35] and (again IIRC) the deployer will go to deploy1001:/srv/mediawiki-staging/php-1.32.0-wmf.24, fetch, check they've got the right commit(s), rebase them in (avoiding breaking any live security patches), update submodule, and scap sync-file [15:18:50] it rebases by default anyway ;) [15:28:23] bpirkle: That all make sense? Or clear as mud? :) [15:28:58] I think it makes sense :) I'm editing Deployments now. Thank you for the help! [15:30:53] The deployer should help you through when they need your input etc [15:33:43] Ok. Hopefully I did that correctly, we'll see how it goes. [15:42:16] https://wikitech.wikimedia.org/w/index.php?title=Deployments&type=revision&diff=1804958&oldid=1804940 [15:43:28] bpirkle: I'm guessing you purposely didn't delete those other rows? [15:43:32] Wondering if that's a VE issue [15:46:02] gack - I meant to copy-paste, possible that I cut-paste instead, I suppose. Restoring... [15:49:04] :) [15:49:09] stuff happens [15:54:09] Reedy: restored, thank you for noticing that [21:44:27] Krenair: between 'update' and 'scap sync-file' would be the "stage on mwdebug, verify in the browser, verify clean logstash logs" [21:45:16] ah yes [21:45:21] knew I was missing something [21:45:35] :)