unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 70456@debbugs.gnu.org
Subject: bug#70456: Request for merging "core-updates" branch
Date: Sat, 10 Aug 2024 08:27:23 +0100	[thread overview]
Message-ID: <87wmkozvl0.fsf@cbaines.net> (raw)
In-Reply-To: <875xtu4jix.fsf@cbaines.net> (Christopher Baines's message of "Thu, 27 Jun 2024 14:12:06 +0100")

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

  reply	other threads:[~2024-08-10  7:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18 14:56 bug#70456: Request for merging core-updates branch Steve George
2024-04-19 14:42 ` bug#70456: Request for merging "core-updates" branch Christopher Baines
2024-04-19 17:00   ` Christopher Baines
2024-04-20 16:16     ` Maxim Cournoyer
2024-04-20 18:08       ` Christopher Baines
2024-04-22 17:31         ` Maxim Cournoyer
2024-06-22 19:33   ` Christopher Baines
2024-06-27 13:12     ` Christopher Baines
2024-08-10  7:27       ` Christopher Baines [this message]
2024-04-26 14:44 ` tumashu
2024-05-08 12:03 ` bug#70456: Process gnome-team before core-updates Christopher Baines
2024-06-14  6:30 ` bug#70456: Request for merging core-updates branch Lars-Dominik Braun
2024-06-14  7:55   ` Guillaume Le Vaillant
2024-06-17 19:53     ` Maxim Cournoyer
2024-06-17 20:19       ` Guillaume Le Vaillant
2024-06-18 12:15         ` Maxim Cournoyer
2024-06-21 15:13       ` Christopher Baines
2024-06-24  4:07         ` Maxim Cournoyer
2024-06-18  2:14 ` bug#70456: core-updates failed package: time 宋文武 via Bug reports for GNU Guix
2024-06-18  7:49   ` bug#70456: core-updates failed package: libfaketime for i686-linux 宋文武 via Bug reports for GNU Guix

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wmkozvl0.fsf@cbaines.net \
    --to=mail@cbaines.net \
    --cc=70456@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).