Request for merging "tex-team" branch

Done

Details

3 participants

Ludovic Courtès
Christopher Baines
Nicolas Goaziou

Owner: unassigned

Submitted by: Nicolas Goaziou

Severity: normal

Nicolas Goaziou wrote on 15 May 2023 17:48

Recipients:(address . guix-patches@gnu.org)

Message-ID:87bkil38ay.fsf@nicolasgoaziou.fr

Hello,

I'd like the current "tex-team" to be merged into master.

AFAIK, there are no blockers yet.

Regards,

Nicolas Goaziou

Christopher Baines wrote on 16 May 2023 11:57

Recipients:(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 63521@debbugs.gnu.org)

Message-ID:87jzx8egfx.fsf@cbaines.net

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

Toggle quote (4 lines)

> I'd like the current "tex-team" to be merged into master.

> AFAIK, there are no blockers yet.

Thanks for creating this issue.

The bordeaux build farm hasn't started building the tex-team branch yet,

although I'll try and get that to happen soon.

Unfortunately the build farms still have quite a lot of work to do with

the master branch, if you compare the substitute availability before the

recent core-updates merge [1] to now [2], things are still very lacking

for armhf-linux and i686-linux.

1: https://data.guix.gnu.org/revision/472706ae2f9160833951a4e4bcc4c206e03097b0/package-substitute-availability

2: https://data.guix.gnu.org/repository/1/branch/master/latest-processed-revision/package-substitute-availability

While I realise that waiting to make changes is fustrating, I think it's

important to try and build things before merging so that the effects are

known. This is also good motivation to get more hardware helping to

build things to speed up the process.

Thanks,

Chris

Nicolas Goaziou wrote on 16 May 2023 14:02

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 63521@debbugs.gnu.org)

Message-ID:87zg641o3b.fsf@nicolasgoaziou.fr

Hello,

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (5 lines)

> While I realise that waiting to make changes is fustrating, I think it's

> important to try and build things before merging so that the effects are

> known. This is also good motivation to get more hardware helping to

> build things to speed up the process.

I opened the issue because the "tex-team" branch was fully built on

CI, according to https://ci.guix.gnu.org/eval/461653.

Should I have looked elsewhere before asking for the merge?

Regards,

Nicolas Goaziou

Christopher Baines wrote on 16 May 2023 14:05

Recipients:(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 63521@debbugs.gnu.org)

Message-ID:87mt24eapk.fsf@cbaines.net

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

Toggle quote (12 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> While I realise that waiting to make changes is fustrating, I think it's
>> important to try and build things before merging so that the effects are
>> known. This is also good motivation to get more hardware helping to
>> build things to speed up the process.
>
> I opened the issue because the "tex-team" branch was fully built on
> CI, according to <https://ci.guix.gnu.org/eval/461653>.
>
> Should I have looked elsewhere before asking for the merge?

I see opening the issue as something to do near the middle of the

process. Similar to opening an issue for some patches, so I think now is

a good time.

However, I'd be sceptical of what you see at [1]. I'm guessing what

you're seeing is correct (at least in the sense of Cuirrass), but there

being no more scheduled builds doesn't mean the branch is good to merge.

1: https://ci.guix.gnu.org/eval/461653

You can see here [2] that while substitute availability is OK for

x86_64-linux and i686-linux, it's poor for all other systems. Also, I

think this might not actually relate to changes on the branch,

substitute availability for aarch64-linux is poor from ci.guix.gnu.org

on the master branch as well.

2: https://qa.guix.gnu.org/branch/tex-team

Ludovic Courtès wrote on 22 May 2023 16:06

Re: bug#63521: Request for merging "tex-team" branch

Recipients:(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)

Message-ID:87ilckxxxr.fsf_-_@gnu.org

Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

Toggle quote (12 lines)> Christopher Baines <mail@cbaines.net> writes:
>
>> While I realise that waiting to make changes is fustrating, I think it's
>> important to try and build things before merging so that the effects are
>> known. This is also good motivation to get more hardware helping to
>> build things to speed up the process.
>
> I opened the issue because the "tex-team" branch was fully built on
> CI, according to <https://ci.guix.gnu.org/eval/461653>.
>
> Should I have looked elsewhere before asking for the merge?

Looking at https://qa.guix.gnu.org/branch/tex-team, there are 13 new

failures on x86_64 (178 vs. 165), but I’m not sure what they are because

the comparison page shows all the changed derivations (whereas we’d like

to see new failures only).

How can we get that info, Chris?

I did find one “new” failure on the comparison page but I can’t believe

it’s related to changes in the branch:

https://data.qa.guix.gnu.org/gnu/store/a7898v4zq86vzn664g5xh0dq6s1p813k-ams-lv2-1.2.2.drv

Thanks,

Ludo’.

Christopher Baines wrote on 22 May 2023 16:36

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:877ct0fmez.fsf@cbaines.net

Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (23 lines)> Hi,
>
> Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:
>
>> Christopher Baines <mail@cbaines.net> writes:
>>
>>> While I realise that waiting to make changes is fustrating, I think it's
>>> important to try and build things before merging so that the effects are
>>> known. This is also good motivation to get more hardware helping to
>>> build things to speed up the process.
>>
>> I opened the issue because the "tex-team" branch was fully built on
>> CI, according to <https://ci.guix.gnu.org/eval/461653>.
>>
>> Should I have looked elsewhere before asking for the merge?
>
> Looking at <https://qa.guix.gnu.org/branch/tex-team>, there are 13 new
> failures on x86_64 (178 vs. 165), but I’m not sure what they are because
> the comparison page shows all the changed derivations (whereas we’d like
> to see new failures only).
>
> How can we get that info, Chris?

So, taking one step back, these numbers come from a comparison of
tex-team and the master branch, and while that sounds sensible, because
it's a comparison of the tips of those branches, I think some of what
you're seeing is breakages that have happened on the master branch but
after the last common commit.

Toggle quote (5 lines)

> I did find one “new” failure on the comparison page but I can’t believe

> it’s related to changes in the branch:

> https://data.qa.guix.gnu.org/gnu/store/a7898v4zq86vzn664g5xh0dq6s1p813k-ams-lv2-1.2.2.drv

Yeah, as I say above it's possible that this has been broken on master
and not tex-team.

I'll look at getting the comparisons to happen between revisions that
better isolate the changes on the branch, I might just initially ignore
the hard case where the "merge base" in the Git sense isn't know by the
data service.

Ludovic Courtès wrote on 22 May 2023 18:01

control message for bug #62712

Recipients:(address . control@debbugs.gnu.org)

Message-ID:87sfbouzhj.fsf@gnu.org

block 62712 by 63521

quit

Christopher Baines wrote on 23 May 2023 15:20

Re: [bug#63521] Request for merging "tex-team" branch

Recipients:(address . 63521@debbugs.gnu.org)

Message-ID:87353nnpwb.fsf@cbaines.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (44 lines)> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Hi,
>>
>> Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:
>>
>>> Christopher Baines <mail@cbaines.net> writes:
>>>
>>>> While I realise that waiting to make changes is fustrating, I think it's
>>>> important to try and build things before merging so that the effects are
>>>> known. This is also good motivation to get more hardware helping to
>>>> build things to speed up the process.
>>>
>>> I opened the issue because the "tex-team" branch was fully built on
>>> CI, according to <https://ci.guix.gnu.org/eval/461653>.
>>>
>>> Should I have looked elsewhere before asking for the merge?
>>
>> Looking at <https://qa.guix.gnu.org/branch/tex-team>, there are 13 new
>> failures on x86_64 (178 vs. 165), but I’m not sure what they are because
>> the comparison page shows all the changed derivations (whereas we’d like
>> to see new failures only).
>>
>> How can we get that info, Chris?
>
> So, taking one step back, these numbers come from a comparison of
> tex-team and the master branch, and while that sounds sensible, because
> it's a comparison of the tips of those branches, I think some of what
> you're seeing is breakages that have happened on the master branch but
> after the last common commit.
>
>> I did find one “new” failure on the comparison page but I can’t believe
>> it’s related to changes in the branch:
>>
>>   https://data.qa.guix.gnu.org/gnu/store/a7898v4zq86vzn664g5xh0dq6s1p813k-ams-lv2-1.2.2.drv
>
> Yeah, as I say above it's possible that this has been broken on master
> and not tex-team.
>
> I'll look at getting the comparisons to happen between revisions that
> better isolate the changes on the branch, I might just initially ignore
> the hard case where the "merge base" in the Git sense isn't know by the
> data service.

I'm making some progress, I think I've changed the qa-frontpage in this

way, but unfortunately tex-team branched off master at a revision that

data.qa.guix.gnu.org hasn't got around to processing yet, so currently

there's no comparison.

Maybe the branch could be rebased or master could be merged in? If you

pick the latest commit with a green tick by it from [1], then that

should mean the data service is able to perform the comparison.

1: http://data.qa.guix.gnu.org/repository/2/branch/master

Ludovic Courtès wrote on 24 May 2023 16:36

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)

Message-ID:87r0r5kd8d.fsf@gnu.org

Hi,

Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (2 lines)

> Christopher Baines <mail@cbaines.net> writes:

[...]

Toggle quote (8 lines)

>> I'll look at getting the comparisons to happen between revisions that

>> better isolate the changes on the branch, I might just initially ignore

>> the hard case where the "merge base" in the Git sense isn't know by the

>> data service.

> I'm making some progress, I think I've changed the qa-frontpage in this

> way,

Awesome. Perhaps qa-frontpage could be explicit about the commits used

for comparison?

Toggle quote (8 lines)

> but unfortunately tex-team branched off master at a revision that

> data.qa.guix.gnu.org hasn't got around to processing yet, so currently

> there's no comparison.

> Maybe the branch could be rebased or master could be merged in? If you

> pick the latest commit with a green tick by it from [1], then that

> should mean the data service is able to perform the comparison.

Sounds like a plan. Nicolas?

Thanks, Chris!

Ludo’.

Ludovic Courtès wrote on 24 May 2023 16:37

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)

Message-ID:87pm6pkd74.fsf@gnu.org

Hi,

Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (2 lines)

> Christopher Baines <mail@cbaines.net> writes:

[...]

Toggle quote (8 lines)

>> I'll look at getting the comparisons to happen between revisions that

>> better isolate the changes on the branch, I might just initially ignore

>> the hard case where the "merge base" in the Git sense isn't know by the

>> data service.

> I'm making some progress, I think I've changed the qa-frontpage in this

> way,

Awesome. Perhaps qa-frontpage could be explicit about the commits used

for comparison?

Toggle quote (8 lines)

> but unfortunately tex-team branched off master at a revision that

> data.qa.guix.gnu.org hasn't got around to processing yet, so currently

> there's no comparison.

> Maybe the branch could be rebased or master could be merged in? If you

> pick the latest commit with a green tick by it from [1], then that

> should mean the data service is able to perform the comparison.

Sounds like a plan. Nicolas?

Thanks, Chris!

Ludo’.

Nicolas Goaziou wrote on 24 May 2023 19:28

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:87cz2phc54.fsf@nicolasgoaziou.fr

Hello,

Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (8 lines)

> Christopher Baines <mail@cbaines.net> skribis:

>> Maybe the branch could be rebased or master could be merged in? If you

>> pick the latest commit with a green tick by it from [1], then that

>> should mean the data service is able to perform the comparison.

> Sounds like a plan. Nicolas?

I rebased the branch on top of c57693846c7c6586c6cd1b4e4002fe399e3a2c42,
which is as green-ticked as a commit can be.

Regards,
-- 
Nicolas Goaziou

Christopher Baines wrote on 25 May 2023 11:00

(no subject)

Recipients:(address . control@debbugs.gnu.org)

Message-ID:87o7m84wfo.fsf@cbaines.net

block 63713 by 63521

thanks

Christopher Baines wrote on 25 May 2023 11:13

Re: [bug#63521] Request for merging "tex-team" branch

Recipients:(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)

Message-ID:87jzww4vmf.fsf@cbaines.net

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

Toggle quote (13 lines)> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Christopher Baines <mail@cbaines.net> skribis:
>
>>> Maybe the branch could be rebased or master could be merged in? If you
>>> pick the latest commit with a green tick by it from [1], then that
>>> should mean the data service is able to perform the comparison.
>>
>> Sounds like a plan.  Nicolas?
>
> I rebased the branch on top of c57693846c7c6586c6cd1b4e4002fe399e3a2c42,
> which is as green-ticked as a commit can be.

Awesome, the comparison is available now. I've also got the qa-frontpage

to find this issue and start submitting builds (this time for most

systems, not just x86_64-linux).

The QA link at the top (of https://issues.guix.gnu.org/63521) should

now also take you to the relevant page.

There's now some waiting to do for the builds to happen, but also more

work needed on the qa-frontpage to better show any breakages and

failures that occur.

Christopher Baines wrote on 2 Jun 2023 11:46

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)

Message-ID:875y866vjq.fsf@cbaines.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (28 lines)> [[PGP Signed Part:Good signature from 5E28A33B0B84F577 Christopher Baines <mail@cbaines.net> (trust ultimate) created at 2023-05-25T10:18:32+0100 using RSA]]
>
> Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>>
>>> Christopher Baines <mail@cbaines.net> skribis:
>>
>>>> Maybe the branch could be rebased or master could be merged in? If you
>>>> pick the latest commit with a green tick by it from [1], then that
>>>> should mean the data service is able to perform the comparison.
>>>
>>> Sounds like a plan.  Nicolas?
>>
>> I rebased the branch on top of c57693846c7c6586c6cd1b4e4002fe399e3a2c42,
>> which is as green-ticked as a commit can be.
>
> Awesome, the comparison is available now. I've also got the qa-frontpage
> to find this issue and start submitting builds (this time for most
> systems, not just x86_64-linux).
>
> The QA link at the top (of https://issues.guix.gnu.org/63521 ) should
> now also take you to the relevant page.
>
> There's now some waiting to do for the builds to happen, but also more
> work needed on the qa-frontpage to better show any breakages and
> failures that occur.

So I still need to do this, however the more significant problem is that

master has diverged significantly (in part at least due to the eudev

change [1] not going to core-updates/another branch).

1: https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00330.html

I've got the qa-frontpage to flag this now, so there should be a warning

at the top of [2] saying there's too many changes between the merge base

and master.

2: https://qa.guix.gnu.org/branch/tex-team

Would you be able to rebase the branch again?

Thanks,

Chris

Nicolas Goaziou wrote on 2 Jun 2023 22:08

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 63521@debbugs.gnu.org)

Message-ID:874jnpeiem.fsf@nicolasgoaziou.fr

Hello,

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (14 lines)> So I still need to do this, however the more significant problem is that
> master has diverged significantly (in part at least due to the eudev
> change [1] not going to core-updates/another branch).
>
> 1: https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00330.html
>
> I've got the qa-frontpage to flag this now, so there should be a warning
> at the top of [2] saying there's too many changes between the merge base
> and master.
>
> 2: https://qa.guix.gnu.org/branch/tex-team
>
> Would you be able to rebase the branch again?

I rebased the branch on top of 75bdd4b05253c0e6ca5399f60e424f0f00fdb673,
which is green.

Regards,
-- 
Nicolas Goaziou

Christopher Baines wrote on 11 Jun 2023 11:31

Recipients:(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 63521@debbugs.gnu.org)

Message-ID:87r0qixrvn.fsf@cbaines.net

Hey,

Substitute availability is looking pretty good for tex-team now [1], it

seems that for most architectures, it only took ~24 hours to recover

from the rebase.

1: https://qa.guix.gnu.org/branch/tex-team

For i686-linux, bordeaux.guix.gnu.org is slow to catch up due to lack of

hardware, and the machine for powerpc64le-linux is temporarily off at

the moment.

I think tex-team is good to merge.

Chris

Nicolas Goaziou wrote on 11 Jun 2023 18:18

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 63521-done@debbugs.gnu.org)

Message-ID:87ilbuas77.fsf@nicolasgoaziou.fr

Hello,

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (2 lines)

> I think tex-team is good to merge.

I concur. Merged. Thank you.

Regards,

Nicolas Goaziou

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 63521@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 63521

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date