[bug#73288] Request for merging "mesa-updates" branch

[bug#73288] Request for merging "mesa-updates" branch

[John Kehayias via Guix-patches via]

Hello Guix,

The mesa-updates branch I think is just almost ready for merging. Besides some other fixes and updates, the main series is tracked at <https://issues.guix.gnu.org/73071>. There is an update to add NVK support to mesa for x86_64-linux which I need to review and push (and rebase to get more fixes from master).

Coverage looks good for x86_64 and i686 on QA, with powerpc64le as well on Berlin. I worry that aarch64 and others may have stalled out on Bordeaux. Perhaps Efraim can chime in there.

With an update for NVK for x86_64, that will take maybe a day to catch up again in builds but tends to be pretty quick. I'm not aware of other blockers.

Thanks!
John

[bug#73288] Request for merging "mesa-updates" branch

[Efraim Flashner]

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

On Mon, Sep 16, 2024 at 02:38:16AM +0000, John Kehayias via Guix-patches via wrote:
> Hello Guix,
> 
> The mesa-updates branch I think is just almost ready for merging. Besides some other fixes and updates, the main series is tracked at <https://issues.guix.gnu.org/73071>. There is an update to add NVK support to mesa for x86_64-linux which I need to review and push (and rebase to get more fixes from master).
> 
> Coverage looks good for x86_64 and i686 on QA, with powerpc64le as well on Berlin. I worry that aarch64 and others may have stalled out on Bordeaux. Perhaps Efraim can chime in there.
> 
> With an update for NVK for x86_64, that will take maybe a day to catch up again in builds but tends to be pretty quick. I'm not aware of other blockers.
> 

I built out to gtk+@3 and gtk on aarch64 without any problems, and I
also built mesa on riscv64 and armhf without any problems.

I haven't tested running any programs on those architectures.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#73288] Request for merging "mesa-updates" branch

[Sharlatan Hellseher]

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


Hi,

The current queue of branches awaiting for review and merge:

| 71408 | python-team         | Fri Jun 07 10:55:25+0200 2024 | Done |
| 72959 | fonts-split-outputs | Mon Sep 02 12:55:25+0200 2024 | Open |
| 73104 | r-team              | Sat Sep 07 17:55:24+0200 2024 | Open |
| 73288 | mesa-updates        | Mon Sep 16 04:38:25+0200 2024 | Open |
| 73502 | go-team             | Thu Sep 26 23:40:25+0200 2024 | Open |
| 73515 | qt-team             | Fri Sep 27 14:46:24+0200 2024 | Open |
| 73558 | wip-gsl-upgrade     | Sun Sep 29 22:33:24+0200 2024 | Open |
| 73567 | lisp-team           | Mon Sep 30 15:43:28+0200 2024 | Open |

- https://qa.guix.gnu.org/branch/python-team
#71408 It was closed due to a large amount of merge conflicts which
can't be resolved quick enough not blocking other changes (CC Steve who
started cherry pick process)

- https://qa.guix.gnu.org/branch/fonts-split-outputs
#72959 Needs to be rebased and place new evaluation (Cc Ludovic)

- https://qa.guix.gnu.org/branch/r-team
#73104 I've pinged R team members if that branch may be merged, the
 changes touch just R packages from CRAN and Bioconductor. QA passed.

- https://qa.guix.gnu.org/branch/mesa-updates
#73288 I'd love to have that branch merged, it would help to pack more
projects for Astro* soft =). 

- https://qa.guix.gnu.org/branch/go-team
#73502 I've rebased it recently and pushed again it looks like most of
the major builds passed successfully, some architectures (aarch64) are
lagged behind. The branch is ready and would let me complete packaging
Prometheus and start large unbundle task.

- https://qa.guix.gnu.org/branch/qt-team
#73515 QA is unhappy: "Unable to check changes between branch and
master. Merge base has not be processed by the data service yet."

- https://qa.guix.gnu.org/branch/wip-gsl-upgrade
#73558 not picked up yet: "Unable to check changes between branch and master.
Merge base has not be processed by the data service yet."

- https://qa.guix.gnu.org/branch/lisp-team
#73567 not picked up yet: "Information unavailable"

--
Oleg

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

[bug#73288] Request for merging "mesa-updates" branch

[Steve George via Guix-patches]

Hi,

On 02/10/2024 21:53, Sharlatan Hellseher wrote:
(...)
> The current queue of branches awaiting for review and merge:
> 
> | 71408 | python-team         | Fri Jun 07 10:55:25+0200 2024 | Done |
> | 72959 | fonts-split-outputs | Mon Sep 02 12:55:25+0200 2024 | Open |
> | 73104 | r-team              | Sat Sep 07 17:55:24+0200 2024 | Open |
> | 73288 | mesa-updates        | Mon Sep 16 04:38:25+0200 2024 | Open |
> | 73502 | go-team             | Thu Sep 26 23:40:25+0200 2024 | Open |
> | 73515 | qt-team             | Fri Sep 27 14:46:24+0200 2024 | Open |
> | 73558 | wip-gsl-upgrade     | Sun Sep 29 22:33:24+0200 2024 | Open |
> | 73567 | lisp-team           | Mon Sep 30 15:43:28+0200 2024 | Open |
> 
(...)
> - https://qa.guix.gnu.org/branch/r-team
> #73104 I've pinged R team members if that branch may be merged, the
>   changes touch just R packages from CRAN and Bioconductor. QA passed.
(...)

What's the definition of when a branch looks good for merging? Does some 
% of substitutes have to be achieved, and for which architectures?

https://qa.guix.gnu.org/branch/r-team shows 96% for x86_64 which is .4 % 
higher than current master [0]. So it's a win by merging it! ;-) 
Seriously, it's also at 96% for aarch64-linux (bordeaux). So "it looks 
good to me".

If that's the case, what prevents this "just" being merged?

Presumably r-team demonstrated their desire for it to be merged by 
opening the merge request ticket. Is it a break in process if someone 
else does it? (rather than waiting for them to respond).

> - https://qa.guix.gnu.org/branch/mesa-updates
> #73288 I'd love to have that branch merged, it would help to pack more
> projects for Astro* soft =).

https://qa.guix.gnu.org/branch/mesa-updates doesn't look as good to me. 
Fine on x86_64, but aarch64-linux is lower than master. Unsure if this 
is due to the build farms still trying to catch-up?

> - https://qa.guix.gnu.org/branch/go-team
> #73502 I've rebased it recently and pushed again it looks like most of
> the major builds passed successfully, some architectures (aarch64) are
> lagged behind. The branch is ready and would let me complete packaging
> Prometheus and start large unbundle task.

This looks about the same as Mesa-upates to me.

Is there a way to compare master<-->go-team to see if different packages 
are failing?

We shouldn't make master break in new ways by merging right!

Steve / Futurile

[0] https://qa.guix.gnu.org/branch/master

[bug#73288] Request for merging "mesa-updates" branch

[Steve George via Guix-patches]

On 02/10/2024 21:53, Sharlatan Hellseher wrote:
> 
> Hi,
> 
> The current queue of branches awaiting for review and merge:
> 
> | 71408 | python-team         | Fri Jun 07 10:55:25+0200 2024 | Done |
> | 72959 | fonts-split-outputs | Mon Sep 02 12:55:25+0200 2024 | Open |
> | 73104 | r-team              | Sat Sep 07 17:55:24+0200 2024 | Open |
> | 73288 | mesa-updates        | Mon Sep 16 04:38:25+0200 2024 | Open |
> | 73502 | go-team             | Thu Sep 26 23:40:25+0200 2024 | Open |
> | 73515 | qt-team             | Fri Sep 27 14:46:24+0200 2024 | Open |
> | 73558 | wip-gsl-upgrade     | Sun Sep 29 22:33:24+0200 2024 | Open |
> | 73567 | lisp-team           | Mon Sep 30 15:43:28+0200 2024 | Open |
> 
> - https://qa.guix.gnu.org/branch/python-team
> #71408 It was closed due to a large amount of merge conflicts which
> can't be resolved quick enough not blocking other changes (CC Steve who
> started cherry pick process)
> 

There are 231 commits ahead of master.

I propose to break this into groups of 30-50 commits at a time. 
Excluding the build-system changes that Lars [0] said they would do. 
Rebase on current master and test that they don't make master 'worse' [1]

Each 30-50 can be put into a new branch for a smaller 'merge-train', to 
see if it makes merging faster overall.

I did the first 31 and tested them. A new branch and merge-request could 
be created for them [2].

I need someone to collaborate with as I can't do that myself.

However, looks like everyone in python-team is busy atm.

I'll cherry-pick the next tranche if someone has the time to work with 
me on merging them - otherwise I'm wasting my time :-)

Steve / Futurile

[0] https://issues.guix.gnu.org/71408#8
[1] no additional breakage, though there are quite a few broken packages
[2] https://issues.guix.gnu.org/71408#13

[bug#73288] Request for merging "mesa-updates" branch

[Ludovic Courtès]

Hello!

Steve George <steve@futurile.net> skribis:

> On 02/10/2024 21:53, Sharlatan Hellseher wrote:
> (...)
>> The current queue of branches awaiting for review and merge:
>> | 71408 | python-team         | Fri Jun 07 10:55:25+0200 2024 | Done
>> |
>> | 72959 | fonts-split-outputs | Mon Sep 02 12:55:25+0200 2024 | Open |
>> | 73104 | r-team              | Sat Sep 07 17:55:24+0200 2024 | Open |
>> | 73288 | mesa-updates        | Mon Sep 16 04:38:25+0200 2024 | Open |
>> | 73502 | go-team             | Thu Sep 26 23:40:25+0200 2024 | Open |
>> | 73515 | qt-team             | Fri Sep 27 14:46:24+0200 2024 | Open |
>> | 73558 | wip-gsl-upgrade     | Sun Sep 29 22:33:24+0200 2024 | Open |
>> | 73567 | lisp-team           | Mon Sep 30 15:43:28+0200 2024 | Open |
>> 
> (...)
>> - https://qa.guix.gnu.org/branch/r-team
>> #73104 I've pinged R team members if that branch may be merged, the
>>   changes touch just R packages from CRAN and Bioconductor. QA passed.
> (...)
>
> What's the definition of when a branch looks good for merging? Does
> some % of substitutes have to be achieved, and for which
> architectures?
>
> https://qa.guix.gnu.org/branch/r-team shows 96% for x86_64 which is .4
> % higher than current master [0]. So it's a win by merging it! ;-)
> Seriously, it's also at 96% for aarch64-linux (bordeaux). So "it looks
> good to me".
>
> If that's the case, what prevents this "just" being merged?
>
> Presumably r-team demonstrated their desire for it to be merged by
> opening the merge request ticket. Is it a break in process if someone
> else does it? (rather than waiting for them to respond).

My take is that by filing a “request to merge”, you claim responsibility
for carrying out the work until it’s merged, unless otherwise stated.
To me, R team folks are responsible for merging ‘r-team’ because they’re
the one who know and they haven’t expressed the desire to get it merged
when it’s good on qa.guix (they didn’t click on “auto-merge”, in GitLab
parlance ;-)).

That said, if there’s no feedback from the R team in a timely fashion,
maybe it’s OK to move to the next branch in the queue.

FWIW, I also pinged 宋文武 regarding ‘fonts-split-outputs’.  If we can’t
get it merged real soon, we should probably skip it.

Thoughts?

Ludo’.