14:00:39 <achow101> #startmeeting 14:00:41 <achow101> #bitcoin -core-dev Meeting: achow101 _aj_ amiti ariard aureleoules b10c BlueMatt brunoerg cfields darosior dergoegge dongcarl fanquake fjahr furszy gleb glozow hebasto instagibbs jamesob jarolrod jonatack josibake kallewoof kanzure kouloumos kvaciral laanwj LarryRuane lightlike luke-jr MacroFake Murch phantomcircuit pinheadmz promag provoostenator ryanofsky sdaftuar S3RK stickies-v sipa sr_gi theStack TheCharlatan vasild 14:00:45 <vasild> hi 14:00:45 <sipa> hi 14:00:47 <cfields> hi 14:00:47 <brunoerg> hi 14:00:48 <stickies-v> hi 14:00:49 <instagibbs> hi 14:00:50 <hebasto> hi 14:00:51 <abubakarsadiq> hi 14:00:55 <Murch[m]> hi 14:00:57 <furszy> hi 14:00:57 <fjahr> hi 14:01:00 <kouloumos> hi 14:01:02 <achow101> There are no preproposed meeting topics, any last minute ones to add? 14:01:34 <tdb3> hi 14:02:01 <achow101> #topic 28.0 release priorities 14:02:29 <achow101> Milestones are https://github.com/bitcoin/bitcoin/milestone/66 and https://github.com/bitcoin-core/gui/milestone/13 14:02:32 <achow101> anything to add or remove? 14:02:53 <achow101> I guess we should remove #22838 and @28417 since we've passed featre freeze 14:02:57 <gribble> https://github.com/bitcoin/bitcoin/issues/22838 | descriptors: Be able to specify change and receiving in a single descriptor string by achow101 ÷ Pull Request #22838 ÷ bitcoin/bitcoin ÷ GitHub 14:03:06 <sipa> #28417 14:03:08 <gribble> https://github.com/bitcoin/bitcoin/issues/28417 | contrib/signet/miner updates by ajtowns ÷ Pull Request #28417 ÷ bitcoin/bitcoin ÷ GitHub 14:03:37 <sipa> yeah 14:06:00 <achow101> Any other topics to discuss? 14:06:37 <cfields> test cmake nag :) 14:06:54 <cfields> #30454 14:06:56 <gribble> https://github.com/bitcoin/bitcoin/issues/30454 | build: Introduce CMake-based build system by hebasto ÷ Pull Request #30454 ÷ bitcoin/bitcoin ÷ GitHub 14:07:09 <achow101> the plan is to merge this right after branching? 14:07:44 <hebasto> yes 14:07:52 <vasild> I use this to early switch to cmake on my dev work: git diff c2d15d993e..hebasto/cmake-staging |git apply --3way 14:08:00 <cfields> roughly yes, once the new bug reports have mostlly stopped coming in. 14:08:18 <vasild> on top of my dev branch, this creates one commit of all cmake stuff and I use it for daily development with cmake 14:08:45 <cfields> For anyone who missed, here's a summary of the status and faq: https://groups.google.com/g/bitcoindev/c/hgKkfQWzrTo 14:09:23 <vasild> well, ok, git commit to create the single commit, this is better then merge-ing cmake-staging into my branch because the merged stuff does not play well with git rebase -i past the merge (my dev work commits) 14:10:01 <tdb3> cfields: I built (successfully) on 30454. Would you like positive results reported in the PR as a comment? 14:10:18 <vasild> c2d15d993e is the commit from master on which hebasto/cmake-staging is based 14:10:23 <cfields> I guess it's worth pointing out that many PRs are going to need to be updated after merge. no avoiding that. 14:10:52 <cfields> tdb3: sure :) 14:11:27 <cfields> tdb3: but please give some details about your setup so we know what's actually working well 14:11:29 <achow101> cfields: there are presumbly a great deal of silent conflicts? 14:12:06 <tdb3> cfields: will do (os, compiler, etc) 14:12:07 <cfields> achow101: Anything that adds/removes a file, mostly. Those shouldn't be silent. 14:12:17 <hebasto> cmake branch do not touch main code base 14:12:28 <achow101> drahtbot doesn't seem to think there's that many conflicts 14:13:50 <cfields> vasild: what doesn't play nice with merge? just curious what the pain is because it's probably not unique to you. 14:14:20 <vasild> it is a silent conflict because git will be happy but it will fail to compile, so the add/remove of the files has to be redone on the CMake stuff 14:15:04 <sipa> it wouldn't be a silent merge conflict if the cmake PR also removed the Makefile.am files at the same time 14:15:06 <vasild> cfields: merge commits past git rebase -i, I did not try that recently, but IIRC git rebase -i flattens the history 14:15:13 <cfields> vasild: ah ok, that's because autotools still exists there. 14:15:16 <vasild> sipa: right! 14:15:29 <cfields> sipa: right, that'll be a very quick follow-up. 14:16:03 <cfields> in fact, maybe we should just plan to do them in quick succession for that reason. 14:16:31 <sipa> cfields: yeah, i'm aware that that's the plan, but wouldn't it make sense to add a "remove Makefile.am files" commit to the cmake PR already (not full autotools purging, just removing those files), to make sure we get observable merge conflicts with anything that needs changing? 14:16:38 <achow101> is there a (draft) pr for deleting autotools? 14:17:14 <hebasto> achow101: https://github.com/hebasto/bitcoin/pull/166 14:19:02 <cfields> sipa: I was thinking it'd be helpful to have a point in the history where both built in parallel. For the sake of finding that point earlier, I was assuming we'd do them in separate merges. 14:19:24 <cfields> but I guess that's not really required as long as there's a commit that satisfies that. 14:19:27 <vasild> hmm, we can have such a point even if it is done as one PR 14:19:35 <cfields> right 14:19:39 <sipa> right 14:20:05 <cfields> sure, sounds good then. 14:20:14 <cfields> hebasto: you have any issues with that? 14:20:41 <stickies-v> perhaps it's possible to rename Makefile.am in 30454 and then delete in follow up? 14:20:55 <hebasto> to observe merge conflicts, maybe open https://github.com/hebasto/bitcoin/pull/166 as a draft in the main repo? 14:20:55 <sipa> stickies-v: that probably won't cause conflicts 14:21:11 <sipa> git is too smart and my just transplant to added stuff to the renamed files 14:21:53 <cfields> it'd be nice if git had a way to poison/deprecate files. 14:22:13 <sipa> cfields: well, delete them 14:22:23 <cfields> heh 14:23:02 <cfields> ok, </topic> 14:23:08 <achow101> Anything else to discuss? 14:25:09 <achow101> #endmeeting