Request for merging "elogind-updates" branch

  • Done
  • quality assurance status badge
Details
3 participants
  • Efraim Flashner
  • ???
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Maxim Cournoyer
Severity
normal
M
M
Maxim Cournoyer wrote on 7 Aug 2023 19:36
(name . guix-patches)(address . guix-patches@gnu.org)
87fs4ueove.fsf@gmail.com
Hi,

I think this branch is ready to go. I've tested a Guix System using it
on a x200 and it behaves correctly.

--
Thanks,
Maxim
?
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
87r0o7a495.fsf@envs.net
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (5 lines)
> Hi,
>
> I think this branch is ready to go. I've tested a Guix System using it
> on a x200 and it behaves correctly.

Hello, we currently have 3 request for merging (rust-team,
elogind-updates, kde-updates) now, should we do the merge in order by:

1. merge master into rust-team (if needed), wait it build, merge
rust-team into master.
2. merge master into elogind-updates, then wait it build on CI, merge
elogind-updates into master.
3. merge master into kde-updates, then wait it build on CI, merge
kde-updates into master.
Or merge both rust-team, elogind-updates and master into kde-updates,
and merge it once into master? Give changes in those 3 are isolated but
require rebuilding a lot, I think to merge them into master once can
save a little work for us and CI.

Thanks.
E
E
Efraim Flashner wrote on 13 Aug 2023 16:11
(name . ???)(address . iyzsong@envs.net)
ZNjkgkLQUxZ5Y2_5@pbp
On Sun, Aug 13, 2023 at 01:41:10PM +0800, ??? wrote:
Toggle quote (22 lines)
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
> > Hi,
> >
> > I think this branch is ready to go. I've tested a Guix System using it
> > on a x200 and it behaves correctly.
>
> Hello, we currently have 3 request for merging (rust-team,
> elogind-updates, kde-updates) now, should we do the merge in order by:
>
> 1. merge master into rust-team (if needed), wait it build, merge
> rust-team into master.
> 2. merge master into elogind-updates, then wait it build on CI, merge
> elogind-updates into master.
> 3. merge master into kde-updates, then wait it build on CI, merge
> kde-updates into master.
>
> Or merge both rust-team, elogind-updates and master into kde-updates,
> and merge it once into master? Give changes in those 3 are isolated but
> require rebuilding a lot, I think to merge them into master once can
> save a little work for us and CI.

For the rust-team branch we have ~7500 packages for x86_64 and aarch64
and almost 0 for the other architectures. IIRC there are no non- rust-*
packages touched in this round of the rust-team branch. Based on my own
previous testing I'm not expecting any breakages of packages based on
the branch. I have no issue with merging the rust-team with one or more
other branches in order to decrease the sheer number of CI builds.

--
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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmTY5IIACgkQQarn3Mo9
g1H4Qg//VwUfTTm9od5hN2htF2agJ5DDcEnpO0sk44MYXDrBL6H8Wr8mVUqZiMbn
aJ+rBh4EC6EAdim45gXyauIi+9lZeSZmaIwX0LC0k2PBymZ0gLFwzjMyceTD9BMg
fcMdCDUm5xQ5CcDddGuZsRubLNmBW+pMxSwAhw2zGE+uVxXMGqW7eXzt5magz3Nk
WYF2sjyDWawAYwUdEYm+PZ6JQVcNMJxwH7jLLvPj3bwlVKXhP6Ve8WyfYkQ013uB
8xm3UTQZ7Cl5szH87ftLPfAVgIVXSBFYRKcx3OprFoxLQEaderGdztqw/Q5A9eRA
fJwGHpFktz6Kvts0STMC0HCCqwF1+lFYd8ZPzWgR9v2Mebuo6HUVWGH6hwdqpbRi
qam+A5IzZ46naZysfuPpa2NcNJtujsfZUB6PySY8UVxEnAMY1EsEDEjnjcnLNzT3
5Btw9MRl1wgrUSAaAfousBX2UWIKBUD1yxAk4kRSHOECzvhz4nQVTtQ+Vdw1leqT
Vhb3mYwpFEOwhimdSqCgYwOhh/MubEuDmt6DOMbSEIfoMkKENtfV3s6B0z1lQh+3
21xWDkH3TQjqni9/TtQf3SU4sx796VEQVwtRJZqqlmWHVw27sUnI/5RWnYdzznKX
CQc3lf9IeEFZHaJQzJDbfh+peXw0CrNT2kPk9S75cLp5IiU+AO0=
=JhM/
-----END PGP SIGNATURE-----


M
M
Maxim Cournoyer wrote on 13 Aug 2023 17:04
(name . ???)(address . iyzsong@envs.net)
87edk7kmqm.fsf@gmail.com
Hi,

??? <iyzsong@envs.net> writes:

Toggle quote (22 lines)
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> Hi,
>>
>> I think this branch is ready to go. I've tested a Guix System using it
>> on a x200 and it behaves correctly.
>
> Hello, we currently have 3 request for merging (rust-team,
> elogind-updates, kde-updates) now, should we do the merge in order by:
>
> 1. merge master into rust-team (if needed), wait it build, merge
> rust-team into master.
> 2. merge master into elogind-updates, then wait it build on CI, merge
> elogind-updates into master.
> 3. merge master into kde-updates, then wait it build on CI, merge
> kde-updates into master.
>
> Or merge both rust-team, elogind-updates and master into kde-updates,
> and merge it once into master? Give changes in those 3 are isolated but
> require rebuilding a lot, I think to merge them into master once can
> save a little work for us and CI.

Since rust-team is already mostly built at this point, I'd merge it
as-is.

I think we should keep the branch separated to preserve as much insights
into new failures as we can from the QA tooling.

--
Thanks,
Maxim
?
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
871qg6c5rv.fsf@envs.net
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (32 lines)
> Hi,
>
> ??? <iyzsong@envs.net> writes:
>
>> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>>
>>> Hi,
>>>
>>> I think this branch is ready to go. I've tested a Guix System using it
>>> on a x200 and it behaves correctly.
>>
>> Hello, we currently have 3 request for merging (rust-team,
>> elogind-updates, kde-updates) now, should we do the merge in order by:
>>
>> 1. merge master into rust-team (if needed), wait it build, merge
>> rust-team into master.
>> 2. merge master into elogind-updates, then wait it build on CI, merge
>> elogind-updates into master.
>> 3. merge master into kde-updates, then wait it build on CI, merge
>> kde-updates into master.
>>
>> Or merge both rust-team, elogind-updates and master into kde-updates,
>> and merge it once into master? Give changes in those 3 are isolated but
>> require rebuilding a lot, I think to merge them into master once can
>> save a little work for us and CI.
>
> Since rust-team is already mostly built at this point, I'd merge it
> as-is.
>
> I think we should keep the branch separated to preserve as much insights
> into new failures as we can from the QA tooling.

Okay, then I'll wait rust-team and elogind-updates to be merged first.

Thanks.
M
M
Maxim Cournoyer wrote on 16 Aug 2023 17:31
control message for bug #65130
(address . control@debbugs.gnu.org)
87sf8jhult.fsf@gmail.com
close 65130
quit
?
Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 65130
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