all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#63521] Request for merging "tex-team" branch
@ 2023-05-15 15:48 Nicolas Goaziou
  2023-05-16  9:57 ` Christopher Baines
  0 siblings, 1 reply; 15+ messages in thread
From: Nicolas Goaziou @ 2023-05-15 15:48 UTC (permalink / raw)
  To: 63521

Hello,

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

AFAIK, there are no blockers yet.

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-15 15:48 [bug#63521] Request for merging "tex-team" branch Nicolas Goaziou
@ 2023-05-16  9:57 ` Christopher Baines
  2023-05-16 12:02   ` Nicolas Goaziou
  0 siblings, 1 reply; 15+ messages in thread
From: Christopher Baines @ 2023-05-16  9:57 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 63521

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


Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> 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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-16  9:57 ` Christopher Baines
@ 2023-05-16 12:02   ` Nicolas Goaziou
  2023-05-16 12:05     ` Christopher Baines
  2023-05-22 14:06     ` Ludovic Courtès
  0 siblings, 2 replies; 15+ messages in thread
From: Nicolas Goaziou @ 2023-05-16 12:02 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 63521

Hello,

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?

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-16 12:02   ` Nicolas Goaziou
@ 2023-05-16 12:05     ` Christopher Baines
  2023-05-22 14:06     ` Ludovic Courtès
  1 sibling, 0 replies; 15+ messages in thread
From: Christopher Baines @ 2023-05-16 12:05 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 63521

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


Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> 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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-16 12:02   ` Nicolas Goaziou
  2023-05-16 12:05     ` Christopher Baines
@ 2023-05-22 14:06     ` Ludovic Courtès
  2023-05-22 14:36       ` Christopher Baines
  1 sibling, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2023-05-22 14:06 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: Christopher Baines, 63521

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?

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’.




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-22 14:06     ` Ludovic Courtès
@ 2023-05-22 14:36       ` Christopher Baines
  2023-05-23 13:20         ` Christopher Baines
  0 siblings, 1 reply; 15+ messages in thread
From: Christopher Baines @ 2023-05-22 14:36 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 63521, Nicolas Goaziou

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


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.

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-22 14:36       ` Christopher Baines
@ 2023-05-23 13:20         ` Christopher Baines
  2023-05-24 14:36           ` Ludovic Courtès
  2023-05-24 14:37           ` Ludovic Courtès
  0 siblings, 2 replies; 15+ messages in thread
From: Christopher Baines @ 2023-05-23 13:20 UTC (permalink / raw)
  To: 63521; +Cc: Ludovic Courtès, Nicolas Goaziou

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


Christopher Baines <mail@cbaines.net> writes:

> 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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-23 13:20         ` Christopher Baines
@ 2023-05-24 14:36           ` Ludovic Courtès
  2023-05-24 14:37           ` Ludovic Courtès
  1 sibling, 0 replies; 15+ messages in thread
From: Ludovic Courtès @ 2023-05-24 14:36 UTC (permalink / raw)
  To: Christopher Baines; +Cc: Nicolas Goaziou, 63521

Hi,

Christopher Baines <mail@cbaines.net> skribis:

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

[...]

>> 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?

> 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’.




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-23 13:20         ` Christopher Baines
  2023-05-24 14:36           ` Ludovic Courtès
@ 2023-05-24 14:37           ` Ludovic Courtès
  2023-05-24 17:28             ` Nicolas Goaziou
  1 sibling, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2023-05-24 14:37 UTC (permalink / raw)
  To: Christopher Baines; +Cc: Nicolas Goaziou, 63521

Hi,

Christopher Baines <mail@cbaines.net> skribis:

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

[...]

>> 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?

> 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’.




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-24 14:37           ` Ludovic Courtès
@ 2023-05-24 17:28             ` Nicolas Goaziou
  2023-05-25  9:13               ` Christopher Baines
  0 siblings, 1 reply; 15+ messages in thread
From: Nicolas Goaziou @ 2023-05-24 17:28 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Christopher Baines, 63521

Hello,

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.

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-24 17:28             ` Nicolas Goaziou
@ 2023-05-25  9:13               ` Christopher Baines
  2023-06-02  9:46                 ` Christopher Baines
  0 siblings, 1 reply; 15+ messages in thread
From: Christopher Baines @ 2023-05-25  9:13 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: Ludovic Courtès, 63521

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


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.

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-05-25  9:13               ` Christopher Baines
@ 2023-06-02  9:46                 ` Christopher Baines
  2023-06-02 20:08                   ` Nicolas Goaziou
  0 siblings, 1 reply; 15+ messages in thread
From: Christopher Baines @ 2023-06-02  9:46 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 63521, Nicolas Goaziou

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


Christopher Baines <mail@cbaines.net> writes:

> [[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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-06-02  9:46                 ` Christopher Baines
@ 2023-06-02 20:08                   ` Nicolas Goaziou
  2023-06-11  9:31                     ` Christopher Baines
  0 siblings, 1 reply; 15+ messages in thread
From: Nicolas Goaziou @ 2023-06-02 20:08 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 63521

Hello,

Christopher Baines <mail@cbaines.net> writes:

> 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




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#63521] Request for merging "tex-team" branch
  2023-06-02 20:08                   ` Nicolas Goaziou
@ 2023-06-11  9:31                     ` Christopher Baines
  2023-06-11 16:18                       ` bug#63521: " Nicolas Goaziou
  0 siblings, 1 reply; 15+ messages in thread
From: Christopher Baines @ 2023-06-11  9:31 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 63521

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

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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* bug#63521: Request for merging "tex-team" branch
  2023-06-11  9:31                     ` Christopher Baines
@ 2023-06-11 16:18                       ` Nicolas Goaziou
  0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Goaziou @ 2023-06-11 16:18 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 63521-done

Hello,

Christopher Baines <mail@cbaines.net> writes:

> I think tex-team is good to merge.

I concur. Merged. Thank you.

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-06-11 16:19 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-15 15:48 [bug#63521] Request for merging "tex-team" branch Nicolas Goaziou
2023-05-16  9:57 ` Christopher Baines
2023-05-16 12:02   ` Nicolas Goaziou
2023-05-16 12:05     ` Christopher Baines
2023-05-22 14:06     ` Ludovic Courtès
2023-05-22 14:36       ` Christopher Baines
2023-05-23 13:20         ` Christopher Baines
2023-05-24 14:36           ` Ludovic Courtès
2023-05-24 14:37           ` Ludovic Courtès
2023-05-24 17:28             ` Nicolas Goaziou
2023-05-25  9:13               ` Christopher Baines
2023-06-02  9:46                 ` Christopher Baines
2023-06-02 20:08                   ` Nicolas Goaziou
2023-06-11  9:31                     ` Christopher Baines
2023-06-11 16:18                       ` bug#63521: " Nicolas Goaziou

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.