Re: Let's merge staging!
Hello! Marius Bakke skribis: > The weather looks good (< 5% missing substitutes). I pushed a merge of > master just now to try and gain a better understanding of what is > missing before actually merging it. > > I suspect it's just the changes from 'master' since it was previously > merged to staging a while back, but Cuirass still is not as convenient > as Hydra for finding regressions, so better safe than sorry. > > I will merge it later today if things look OK. I think the merge hasn’t happened yet. :-) The stats I get for x86_64 after manually restarting the mariadb and gmime builds (the former needs more memory that build machines usually have, and the latter has a non-deterministic test failure it seems): --8<---cut here---start->8--- ludo@ribbon ~/src/guix$ ./staging/bin/guix describe Generacio 1 Jun 05 2019 12:57:12(nuna) guix 30e12b9 repository URL: https://git.savannah.gnu.org/git/guix.git branch: staging commit: 30e12b9664d774aca3948b1fa2e0aee6af09ca40 ludo@ribbon ~/src/guix$ ./staging/bin/guix weather -c10 -s x86_64-linux computing 9,851 package derivations for x86_64-linux... looking for 10,247 store items on https://ci.guix.gnu.org... https://ci.guix.gnu.org 78.8% substitutes available (8,072 out of 10,247) 25,062.2 MiB of nars (compressed) 69,325.7 MiB on disk (uncompressed) 0.000 seconds per request (4.4 seconds in total) 2,339.6 requests per second --8<---cut here---end--->8--- Thanks, Ludo’.
Re: Let's merge staging!
Pierre Neidhardt writes: > Marius Bakke writes: > >> Can you share the patch? (guix utils) should not trigger a world >> rebuild AFAIK. > > Yes, that's what I've been told, but I tried both (guix build utils) and > (guix utils), they both resulted in a world rebuilt. Unless I did > something wrong... > > https://issues.guix.gnu.org/issue/36000 That patch is for (guix build utils), which is included from gnu-build-system and necessarily rebuilds the world. :-) (guix utils) is not meant to be used in build-side code (i.e. it's only for the higher Guix APIs) and so should be free to change at any time. signature.asc Description: PGP signature
Re: Let's merge staging!
Pierre Neidhardt writes: > Is it too late to merge #36000 (guix: Add helper for generating desktop > entry files.)? Staging is currently 'frozen' pending a merge, so yes. > It's non-disruptive but since it modifiers (guix utils) it triggers a > world rebuild. Can you share the patch? (guix utils) should not trigger a world rebuild AFAIK. In any case the 'staging' branch usually handles only a limited number of rebuilds (see 14.6 "Submitting patches" in the Guix manual). Full-rebuild changes needs to go through 'core-updates'. signature.asc Description: PGP signature
Re: Let's merge staging!
Ludovic Courtès writes: > Hi! > > Marius Bakke skribis: > >> The staging branch has been accumulating updates for a while now. >> We have Mesa 19, Sphinx 2.0, GStreamer 1.16, ALSA 1.1.9, as well as some >> Python updates. See `git shortlog -n master..staging` for the scoop. >> >> I suggest we "freeze" (meaning no further updates, only bugfixes) this >> branch tomorrow at midnight UTC, and then merge it once the CI lights >> are green. >> >> Anything missing before the freeze? > > Not from me, go for it! You can monitor: > > guix weather -c10 > > or similar for that branch. The weather looks good (< 5% missing substitutes). I pushed a merge of master just now to try and gain a better understanding of what is missing before actually merging it. I suspect it's just the changes from 'master' since it was previously merged to staging a while back, but Cuirass still is not as convenient as Hydra for finding regressions, so better safe than sorry. I will merge it later today if things look OK. Note to self: it would be good to have more frequent merges during the freeze period. signature.asc Description: PGP signature
Re: Let's merge staging!
Hi! Marius Bakke skribis: > The staging branch has been accumulating updates for a while now. > We have Mesa 19, Sphinx 2.0, GStreamer 1.16, ALSA 1.1.9, as well as some > Python updates. See `git shortlog -n master..staging` for the scoop. > > I suggest we "freeze" (meaning no further updates, only bugfixes) this > branch tomorrow at midnight UTC, and then merge it once the CI lights > are green. > > Anything missing before the freeze? Not from me, go for it! You can monitor: guix weather -c10 or similar for that branch. Thank you, Ludo’.
Re: Let's merge staging!
>> https://issues.guix.info/issue/32102 > > These commits are on the current 'core-updates' branch as of 89e7f90d. > > Changing python-build-system entails many more rebuilds than 'staging' > usually handles. I'd rather not include it this round because that > would probably double the amount of builds and thus time to merge. Yeah, sure. I was just worried that that commit had somehow been lost. If it's safe somewhere, then I'm fine. signature.asc Description: PGP signature
Re: Let's merge staging!
Arun Isaac writes: >> Anything missing before the freeze? > > I closed issue 32102 and pushed a patch to core-updates-next back in > November 2018, but it seems to have been lost somehow. It's still not in > master. Can we include it now in staging? > > https://issues.guix.info/issue/32102 These commits are on the current 'core-updates' branch as of 89e7f90d. Changing python-build-system entails many more rebuilds than 'staging' usually handles. I'd rather not include it this round because that would probably double the amount of builds and thus time to merge. Let's focus on getting the 'core-updates' branch in shape instead. It is long overdue by now... signature.asc Description: PGP signature
Re: Let's merge staging!
> Anything missing before the freeze? I closed issue 32102 and pushed a patch to core-updates-next back in November 2018, but it seems to have been lost somehow. It's still not in master. Can we include it now in staging? https://issues.guix.info/issue/32102 signature.asc Description: PGP signature
Let's merge staging!
Hello! The staging branch has been accumulating updates for a while now. We have Mesa 19, Sphinx 2.0, GStreamer 1.16, ALSA 1.1.9, as well as some Python updates. See `git shortlog -n master..staging` for the scoop. I suggest we "freeze" (meaning no further updates, only bugfixes) this branch tomorrow at midnight UTC, and then merge it once the CI lights are green. Anything missing before the freeze? signature.asc Description: PGP signature
