[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#70456: Request for merging "core-updates" branch
From: |
Christopher Baines |
Subject: |
bug#70456: Request for merging "core-updates" branch |
Date: |
Sat, 10 Aug 2024 08:27:23 +0100 |
User-agent: |
mu4e 1.12.4; emacs 29.3 |
Christopher Baines <mail@cbaines.net> writes:
> Christopher Baines <mail@cbaines.net> writes:
>
>> I've spent a bunch of time in the last few days trying to see if I can
>> get the bordeaux build farm moving on core-updates and I think things
>> are moving at pace now.
...
> Some good progress was made with building core-updates, so I'm hoping
> that with this next iteration (and hopefully a quiet period on the
> master branch) we can get to the point where we can merge.
Substitute availability has been progressing well for core-updates, with
the biggest fix being the switch to datefudge for the nss tests on 32bit
systems.
Unfortunately it's been a while since core-updates has been rebased, and
the master branch hasn't been quiet so even though substitute
availability looks good, core-updates is missing ~2500 commits from
master, including some impactful changes and not representative of the
state of master if it was merged.
I did try rebasing around 3 weeks ago, but I got stuck on some rust
related conflicts and gave up. I've had another go now though and I've
managed to rebase, although I did remove some of the rust changes (I've
sent them as patches here [1].
1: https://issues.guix.gnu.org/72553
Hopefully the builds won't take more than a week or two to happen.
signature.asc
Description: PGP signature
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- bug#70456: Request for merging "core-updates" branch,
Christopher Baines <=