[00:04:22] (PS3) Eileen: Make compose project name configurable [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664637 (owner: AndyRussG) [00:04:24] (PS1) Eileen: Add in dmaster site [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 [00:32:30] (PS1) Eileen: Further sync with upstream [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664685 [00:32:55] (CR) Eileen: [V: +2 C: +2] "Per previous - self-merging sync with upstream" [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664685 (owner: Eileen) [00:33:45] AndyRussG: I just synced back the upstream-merge that should help on the utf8mb4 issue so do a git pull on buildkit before any more testing [00:58:20] Fundraising-Backlog, fundraising-tech-ops: Issue new SSL Client Certificate for jjoe - https://phabricator.wikimedia.org/T274962 (Dwisehaupt) [00:59:00] Fundraising-Backlog, fundraising-tech-ops: Issue new SSL Client Certificate for avalkov - https://phabricator.wikimedia.org/T274963 (Dwisehaupt) [01:09:33] (PS1) Eileen: Fix to last [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664689 [01:12:12] (PS2) Eileen: Fix to last [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664689 [01:14:09] (CR) Eileen: [V: +2 C: +2] "self-merge as agreed for these sync patches" [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664689 (owner: Eileen) [01:14:10] (CR) Eileen: [V: +2 C: +2] Make compose project name configurable [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664637 (owner: AndyRussG) [02:11:11] eileen: thx! ^ [02:11:23] no worries AndyRussG [02:14:48] eileen: I'm at-the-keyboard or at-the-keyboard-ish most of the rest of the evening, so pls lmk if you run into anything I might help with, or if there's anything I can fix on the Xdebug front :) [02:15:03] cool - will do [02:18:41] :) [03:30:41] AndyRussG: I've got the tests working with it now [03:31:08] looking at getting listening working - I think maybe I normally have always listening on [03:47:06] eileen: ahh great news! [03:47:17] was it just the buildkit update with the DB encoding? or was there more? [03:47:32] oh the buildkit update has the db encoding [03:47:45] right so was that all that was needed for tests to pass? [03:47:54] oh - I haven't run them all [03:48:11] I just want the ability to run some within the IDE [03:48:23] ah got it, right, I misunderstood :) [03:48:39] but - when you debug the web - do you do something to trigger it to use xdebug? [03:48:48] eileen: yes there are two options [03:49:51] one is to add an "XDEBUG_SESSION_START=something-or-other" parameter on your url [03:49:54] that should trigger it [03:50:04] that's what IDEs normally do to start a debugging session [03:50:11] (on a php web app) [03:51:10] the other option is to change xdebug.remote_autostart to "on" in config/civicrm/xdebug-web.ini [03:51:17] yeah - & that is what it's set up for isn't it [03:51:44] I think I normally use the other because I normally just debug from chrome (not opening via the IDE [03:51:51] with the remote autostart to on, it'll always call the IDE, but after you make that change, you have to restart the web server [03:51:58] hmmm Chrome may do something similar [03:52:20] to restart the web server after changing that file, just do docker-compose restart civicrm [03:52:32] that'll restart the container and the Web server with it [03:53:06] you can also cause command line scripts to always call the debugger by changing remote autostart to on in config/civicrm/xdebug-cli.ini [03:53:08] ok - I guess I debug around 80% of the time when I use the web UI so that's probably why I use always on [03:53:43] (for the cli change to take effect, you don't need to restart the container) [03:53:57] hmmm well there are two settings to set to "on" [03:54:21] I think phpstorm offers bookmarks / chrome widgets for turning it on & off but I think I may have gotten fed up with them in the past [03:54:31] mmmm hmmm [03:54:40] well so server-side there are two settings [03:54:47] one is xdebug.remote_enable [03:54:55] that I think you do always want to be on [03:55:10] that just enables the whole xdebug system in some sense [03:55:17] but doesn't actually triggering it calling the IDE [03:55:29] remember whatever you're debugging with (IDE or Chrome) is actually a server [03:55:40] so it's the Web application that needs to decide to call the server [03:55:55] remote_enable doesn't actually cause that to happen necessarily [03:56:15] but with that on and remote_autostart on it always happens [03:56:29] that is, with both of those on, it always calls the IDE/Xdebug plugin/whatever listens on that port [03:56:50] and that can get really annoying, if the IDE brings up a dialogue box for every single PHP webrequest [03:57:39] on the other hand, with just remote_enable on, it just waits to find that URL parameter in the request, or cookie I think is the other way, and only in those cases it actually calls the server [03:57:50] sorry if this is all stuff you already know heheh [03:57:57] oh yeah - so in phpstorm your ide can be listening or not listening [03:58:08] yis, same with Eclipse [03:58:16] & if it's not listening then I guess it's a little slower, but no dialogues [03:58:26] right [03:58:52] btw the xdebug setup here is very similar to what you have with the other Docker image [03:59:52] here doing some automatic setup very similar to what was in that image: https://gerrit.wikimedia.org/r/c/releng/dev-images/+/663294/7/dockerfiles/fundraising-buster-php73/create-xdebug-common-ini.sh [04:01:15] yep - it looks like I prefer remote =_enable but the 'just in time [04:01:20] 'mode seems interesting [04:03:06] ok - I've found something that maybe needs cleaning up between builds [04:06:41] (PS2) Eileen: Add in dmaster site [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 [04:09:10] eileen: ahhh hmmm is that (/web/sites/default/files/civicrm/templates_c/*) also something to clean up in wmff? [04:09:34] just trying the previous version of the change now btw [04:09:53] AndyRussG: yeah - although I'm not sure whether or not it is the source of my problem yet - but it could hold stuff that could mess with stuff [04:10:02] it's a cache [04:10:19] hmmm ok also gitignored I assume? [04:11:02] yeah there's a bunch of stuff in there in the wmff site too [04:11:47] all of sites/default/files is gitignored [04:11:57] what about just nuking all the contents of files, if it's all generated? [04:12:43] hmmm I got this error: [04:12:45] +++ mv /srv/civi-sites/dmaster/drupal /srv/civi-sites/dmaster/web [04:12:47] +++ '[' 7.x == 7.x ']' [04:12:49] +++ pushd /srv/civi-sites/dmaster/web/includes/database/mysql [04:12:51] /srv/civi-sites/dmaster/web/includes/database/mysql /srv/civicrm-buildkit /srv/civi-sites [04:12:53] +++ patch database.inc [04:12:55] /srv/civicrm-buildkit/src/civibuild.lib.sh: line 1049: patch: command not foun [04:12:57] but actually I forgot to update buildkit [04:13:08] gonna retry with it updated and the new version of your patch [04:18:07] K trying again [04:31:35] eileen: got an error again, here's the full output: https://paste.toolforge.org/view/51f78649 [04:39:53] AndyRussG: does /srv/civi-sites/dmaster/web/sites/all/modules/civicrm have civicrm files in it (it does for me) [04:43:30] eileen: nope, there's actually no civicrm directory there [04:43:32] docker@civicrm:/$ ls /srv/civi-sites/dmaster/web/sites/all/modules/ [04:43:34] README.tx [04:44:41] AndyRussG: was it a previous failed run? I note [04:44:41] [[Download dmaster (type 'drupal-demo' in '/srv/civi-sites/dmaster')]] [04:44:41] Already downloaded dmaster [04:45:30] ah yeah there was a failed run before [04:45:48] eileen: I was actually going to ask if there was more to do wrt source code management there [04:46:05] buildkit downloads it - I think that's OK [04:46:07] as in, for wmff we have the script download things with the correct Gerrit remote there [04:46:21] so do we clean it out fully then in setup.sh? [04:46:36] lemme clear it out and try running again [04:48:52] K it's running... also killed the db [04:48:57] (I did, not the script) [04:55:45] yeah we don't want to delete the repos if we don't need to as we blow away git branches etc [04:56:53] right [04:58:52] it did fail again, just re-cloning everything now to get a fresh state, in any case [04:59:43] (internet is just being slow now) [05:38:15] eileen: I'm getting some network errors with trying to re-clone the repos [05:38:27] not sure if it's Gerrit or my internet [05:38:50] anyway I have some minor comments that I'll just put on the patch, and will re-try actually running it tomorrow :) [05:51:08] (CR) AndyRussG: "Thanks for doing this!!! Just a few thoughts in inline comments... Having trouble testing due to internet issues, so I'll try again tomorr" (3 comments) [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 (owner: Eileen) [06:59:41] (PS3) Eileen: Add in dmaster site [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 (https://phabricator.wikimedia.org/T274944) [07:45:52] (CR) jerkins-bot: [V: -1] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/664744 (owner: L10n-bot) [07:47:04] (CR) Raimond Spekking: [C: +2] "false positive" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/664744 (owner: L10n-bot) [12:37:31] PROBLEM - check_mysql on frdb2001 is CRITICAL: Slave IO: Connecting Slave SQL: Yes Seconds Behind Master: (null) [12:42:29] RECOVERY - check_mysql on frdb2001 is OK: Uptime: 1366618 Threads: 12 Questions: 15565070 Slow queries: 641 Opens: 18653 Flush tables: 1 Open tables: 840 Queries per second avg: 11.389 Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 0 [16:14:06] (CR) AndyRussG: "Hey thanks so much for the update!! Just two more very tiny nitpicks heheh............." (2 comments) [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 (https://phabricator.wikimedia.org/T274944) (owner: Eileen) [16:18:42] Fundraising-Backlog, fundraising-tech-ops: Issue new SSL Client Certificate for ayounsi - https://phabricator.wikimedia.org/T274691 (Dwisehaupt) Open→Resolved Certificate renewed and delivered via email. Password sent via SMS. [16:19:03] Fundraising-Backlog, fundraising-tech-ops: Issue new SSL Client Certificate for rmurthy - https://phabricator.wikimedia.org/T274693 (Dwisehaupt) Open→Resolved [16:26:06] fr-tech any news for scrum of scrums? [16:28:26] nop [16:28:52] maybe docker stuff? [16:44:46] (CR) AndyRussG: "Hi! So I was able to try running this again, and now got a different error. I did remove the previous dmaster source under /src/civi-sites" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 (https://phabricator.wikimedia.org/T274944) (owner: Eileen) [17:44:51] AndyRussG: take a look at https://phabricator.wikimedia.org/T275054 [17:45:06] new property in the CentralNoticeImpression schema [17:45:12] looks like we need to update the schema? [17:45:18] half a million invalid events [17:45:26] thanks for catching that awight! [17:48:15] ejegg: ahh thanks! [17:48:23] https://wikitech.wikimedia.org/wiki/Event_Platform/Schemas#Modifying_schemas [17:48:28] We don't use that schema so we could just turn it off [17:48:39] yeah there's also a task about the general migration for CN [17:48:41] ah yeah, let's do that for now [17:48:53] better not to spam invalid events [17:49:20] yeah for sure... though it could be thwt WMF Deutchland uses them [17:49:58] awight: does WMDE use those events? Guess that might be why you noticed the invalidity... [17:50:31] ejegg awight https://phabricator.wikimedia.org/T271168 [17:50:48] well we could turn off for now, then publish a new schema version and push out a backport patch to use the new version before turning it back on [17:51:17] Good question, WMDE Fundraising might use them, but I'm afraid they mostly built their own parallel banner impression system :-/ [17:51:29] thanks awight [17:51:37] awight: ahhh okok also hi!!!! [17:52:01] ejegg awight so we should really have turned it off as a 1% sample default a while a go [17:52:03] ago [17:52:22] we can do that easily though individual campaings will still be able to enable it [17:52:26] jfyi https://meta.wikimedia.org/wiki/Schema:WMDEBannerInteractions https://meta.wikimedia.org/wiki/Schema:WMDEBannerInteractions https://meta.wikimedia.org/wiki/Schema:WMDEBannerSizeIssue [17:52:54] also I think it's easy to do the migration IIRC, and didn't notice for sure if that was the issue? [17:52:58] The weird extra field in your CentralNoticeImpression events is hard to explain, though. It doesn't seem to be intentional. [17:53:30] I only noticed because I was monitoring other event topics, btw. [17:53:57] But the possibly related patch is concerning, it changes how minification is done. [17:55:41] yeah just looking at that [17:55:59] I wouldn't expect that to be related to schema errors tho [17:57:25] Can you tell how optedOutCampaigns gets wired into the event in the first place? [17:57:38] ejegg awight ahhh no the error now is related to the new campaigns filter feature [17:58:29] awight that's a new data point but not intentionally sent back via the event, but no reason not to [17:58:58] awight check out the new "Banners" tab under your WP user preferences [17:59:32] awight ejegg we can do a schema update to add that property and then push out that change on a Backport deploy [17:59:42] so apparently nothing to do with the EL migration thing [18:00:07] But if you're copying the entire state object there will be many more fields required. [18:00:12] Fundraising-Backlog, FR-Civi-Dedupe, fr-donorservices: Civi dedupe count report and manual merges are hanging - https://phabricator.wikimedia.org/T240269 (MBeat33) Open→Resolved a:MBeat33 @SHust is using a different way to tally merges for agents, and this report is working as well (TY fo... [18:00:27] I see a sanitization function state.getDataCopy, which is supposed ... [18:00:30] aah [18:00:49] it strips fields out rather than only allowing desired fields. Maybe that logic should be flipped around? [18:01:27] gotta run! [18:09:06] awight: cya! [18:11:32] we should probably check with Anaytics about how a schema update might interact with their migration [18:14:34] AndyRussG: It's fine to update old-style schemas. [18:14:55] I guess the only question is whether you actually want that new field being collected in events? [18:18:15] awight: yeah I think it's reasonable? hmmm though also potentially personally identifying, so maybe not... [18:18:27] awight: also good point about reversing the logic on sanitization! [18:18:41] re. the migration, there's a nice script in schemas-event-secondary/scripts/eventlogging_legacy_schema_convert which does the porting between metawiki:Schema and the new format, and I see that no patch was created yet, so there's no danger of collision between a tweak to the legacy schema and any new stuff. [18:19:33] ahhh noice [18:20:26] awight ejegg since I think there might be discussion around privacy concerns with the new field, let's just sanitize it out and also make the default sample rate for the new field 0 [18:20:55] I can make patches and then we can book a Backdeploy port, sound good? [18:21:56] yikes, I see what you mean by custom eventlogging, good luck with that! [18:24:00] awight: ? [18:25:10] Sorry, I'm not adding anything new. Just looking at the code you linked in T271168 and it does look tricky. [18:25:11] T271168: CentralNoticeBannerHistory and CentralNoticeImpression Event Platform Migration - https://phabricator.wikimedia.org/T271168 [18:33:07] awight hehehh ahh right... yeah I think that's mostly old cruft now, thankfully! as in I think the current EL client-side stuff can handle what's needed? heheh hope so 8p [18:33:54] awight also as ejegg mentioned in the task, thanks so so much for the heads-up eh! [18:46:40] Fundraising-Backlog, fundraising-tech-ops: Update mariadb GLOBAL defaults for frdbs in preparation for utf8mb4 conversion - https://phabricator.wikimedia.org/T274438 (Dwisehaupt) Decided to go ahead and roll this on frdb1002 to make it consistent with the other dbs until the upgrade is complete. The foll... [18:52:47] Fundraising-Backlog, fundraising-tech-ops: Update mariadb GLOBAL defaults for frdbs in preparation for utf8mb4 conversion - https://phabricator.wikimedia.org/T274438 (Dwisehaupt) Open→Resolved a:Dwisehaupt Codified in puppet so that the settings will last over restarts. ` 344efda0 Update mar... [18:52:49] Fundraising-Backlog, fundraising-tech-ops: Fix our database to support emojis - convert tables to utf8mb4 - https://phabricator.wikimedia.org/T270218 (Dwisehaupt) [18:55:27] Fundraising Sprint Corrugated super slide, Fundraising Sprint Downed power line jump rope, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Patch-For-Review: Deal with utf8 issues for new install - https://phabricator.wikimedia.org/T273704 (Dwisehaupt) >>! In T273704#6817387, @Eileenmcnaug... [19:07:00] Fundraising-Backlog: Language issues with LATAM pages for up coming campaign - https://phabricator.wikimedia.org/T275065 (EMartin) [19:08:02] (PS1) AndyRussG: Remove optedOutCampaigns property from impression data [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/664887 (https://phabricator.wikimedia.org/T275054) [19:09:33] ejegg awight https://gerrit.wikimedia.org/r/c/mediawiki/extensions/CentralNotice/+/664887 [19:10:34] looking [19:17:19] (CR) Ejegg: [C: +2] Remove optedOutCampaigns property from impression data [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/664887 (https://phabricator.wikimedia.org/T275054) (owner: AndyRussG) [19:17:48] ejegg: thanks! [19:18:07] ejegg this one shouldn't be merged until deploy time, hence the -1: https://gerrit.wikimedia.org/r/c/operations/mediawiki-config/+/664889 [19:21:56] fr-tech ejegg I'll book the 16:00 PST backport deploy window for this CN update: https://wikitech.wikimedia.org/wiki/Deployments#Thursday,_February_18 [19:25:03] sounds good AndyRussG [19:27:25] rebooting the VPS, back in a few if all goes well (there was a grub update & I'm a bit hazy on how that goes in this virtualization system) [19:42:08] Fundraising-Backlog: Civi Upgrade UI issue: Some dashlets don't populate, others are hard to read now - https://phabricator.wikimedia.org/T275071 (CaitVirtue) [19:44:00] Fundraising-Backlog: Language issues with LATAM pages for up coming campaign - https://phabricator.wikimedia.org/T275065 (EMartin) Hello, I also tested Peru through Ingenico and got all English with this URL: https://donate.wikimedia.org/w/index.php?title=Special:LandingPage&country=PE&uselang=SP&utm_medium=... [19:45:55] (Merged) jenkins-bot: Remove optedOutCampaigns property from impression data [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/664887 (https://phabricator.wikimedia.org/T275054) (owner: AndyRussG) [19:46:58] Fundraising Sprint Downed power line jump rope, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi Upgrade UI issue: Some dashlets don't populate, others are hard to read now - https://phabricator.wikimedia.org/T275071 (DStrine) [19:50:06] (PS4) Eileen: Add in dmaster site [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664684 (https://phabricator.wikimedia.org/T274944) [19:51:39] Fundraising Sprint Downed power line jump rope, Fundraising-Backlog, fr-donorservices: Wikimedia's soft descriptor - https://phabricator.wikimedia.org/T272995 (EMartin) It should be noted that Legal has approved Wikimedia 877 600 9454 also. [19:55:40] Fundraising Sprint Yellow hornets of kindness and healing, Fundraising Sprint Zeitgeistbusters, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, and 3 others: Civi: Recur fail message sent to donor w/non-failed donation - https://phabricator.wikimedia.org/T269372 (MBeat33) cid=603426 had two a... [20:14:38] (PS1) Jgleeson: Clear out unused files and update Dockerfile [wikimedia/fundraising/crm/civiproxy] - https://gerrit.wikimedia.org/r/664901 (https://phabricator.wikimedia.org/T268495) [20:29:11] (CR) Awight: [V: +1] "Tested locally, the events are valid now." [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/664887 (https://phabricator.wikimedia.org/T275054) (owner: AndyRussG) [20:59:52] Fundraising-Backlog, fundraising-tech-ops: Issue new SSL Client Certificate for nnichols - https://phabricator.wikimedia.org/T273488 (Dwisehaupt) Certificate renewed and delivered via email. Password sent via SMS. [21:07:17] AndyRussG: I looked at that error & my first thought was that maybe there was a temporary outage at the remove url [21:08:09] hummm [21:08:37] eileen: btw we're in the tech-talk call to talk about e-mail pref center [21:08:45] eileen: https://meet.google.com/odz-juym-nog?authuser=0 [21:34:04] (PS1) Eileen: De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) [21:37:39] (CR) jerkins-bot: [V: -1] De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) (owner: Eileen) [21:47:05] (PS2) Eileen: De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) [21:49:13] (PS3) Eileen: De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) [21:53:37] (CR) jerkins-bot: [V: -1] De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) (owner: Eileen) [22:25:12] (PS1) Jgleeson: WIP: Add CiviProxy setup [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664939 (https://phabricator.wikimedia.org/T268683) [22:30:33] ejegg: if you are still there I have a question... [22:30:49] (PS2) Jgleeson: WIP: Add CiviProxy setup [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/664939 (https://phabricator.wikimedia.org/T268683) [22:32:05] (Restored) Eileen: Re-add settings_location.php [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/649724 (https://phabricator.wikimedia.org/T268495) (owner: Eileen) [22:35:35] sure eileen, what's up? [22:36:13] so the gerrit to remote the 'sites' symlink is failing on a line in buildkit that alters the permissions on the harveydent script [22:36:43] my question is - do we fix the path in the script - or just check in the executable permission on the harveydent script [22:37:04] (it can't run on live as the amp util is not on live so it doesn't feel like a security risk) [22:46:06] Fundraising Sprint Bee Wheel, Fundraising Sprint Downed power line jump rope, Fundraising-Backlog, MediaWiki-extensions-DonationInterface, fr-email-preference-center: Create new subpage for Special:EmailPreferences - https://phabricator.wikimedia.org/T268510 (Ejegg) The overhead of maintainin... [22:46:41] oh, then let's just change the harveydent executable then [22:46:45] then then [22:47:14] cool - I'll put up that patch [22:48:09] cool. looks like the .gitignore file will need a bit more updating too? still seeing a bunch of paths that start with sites/ [22:50:04] (PS1) Eileen: Commit harvey-dent with correct executable file mode [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664946 (https://phabricator.wikimedia.org/T273822) [22:50:35] ejegg: yeah I altered 1 but probably need to alter all - if you can +2 ^^ I'll remove from buildkit [22:50:57] ejegg: also - do you know how to get a merge commit through gerrit on buildkit [22:53:12] (CR) Ejegg: [C: +2] Commit harvey-dent with correct executable file mode [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664946 (https://phabricator.wikimedia.org/T273822) (owner: Eileen) [22:53:37] eileen you mean merging from upstream? [22:54:28] ejegg: yep - if I do pull upstream master where master is https://github.com/civicrm/civicrm-buildkit [22:54:43] then everything except the very last commit is already synced [22:54:56] (the ONLY differences are the composer version & the gerrit file) [22:55:16] but I can't get git review to work as there are commits it thinks need to be included [22:57:19] dang, since they're different SHAs I guess [22:58:17] because they don't all have change ids [22:58:33] but if I rebase then they kinda get rebased out as they are all resolved [23:02:22] (PS1) Eileen: Remove hardver dent chmod in wmff specific [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664948 (https://phabricator.wikimedia.org/T273822) [23:03:06] that ^^ just makes the change & maybe that's enough for now since I still hope to switch composer version & switch to using the upstream in ci [23:06:25] Fundraising-Backlog, fundraising-tech-ops, Epic: Epic: fundraising database approaching data partition capacity - https://phabricator.wikimedia.org/T241083 (Jgreen) [23:06:29] Fundraising-Backlog, fundraising-tech-ops, Epic: Epic: fundraising database approaching data partition capacity - https://phabricator.wikimedia.org/T241083 (Jgreen) [23:10:13] (CR) Ejegg: [C: +2] Remove hardver dent chmod in wmff specific [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664948 (https://phabricator.wikimedia.org/T273822) (owner: Eileen) [23:13:26] (CR) Eileen: [V: +2] Remove hardver dent chmod in wmff specific [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/664948 (https://phabricator.wikimedia.org/T273822) (owner: Eileen) [23:13:58] (PS4) Eileen: De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) [23:14:46] ok - I've fixed gitignore - let's see if it passes now [23:18:29] (PS1) AndyRussG: Remove optedOutCampaigns property from impression data [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/664949 (https://phabricator.wikimedia.org/T275054) [23:18:53] (CR) AndyRussG: [C: +2] Remove optedOutCampaigns property from impression data [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/664949 (https://phabricator.wikimedia.org/T275054) (owner: AndyRussG) [23:26:39] (Merged) jenkins-bot: Remove optedOutCampaigns property from impression data [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/664949 (https://phabricator.wikimedia.org/T275054) (owner: AndyRussG) [23:29:19] (CR) jerkins-bot: [V: -1] De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822) (owner: Eileen) [23:50:43] (PS5) Eileen: De-symlink sites folder [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/664929 (https://phabricator.wikimedia.org/T273822)