Re: [PATCH stable-7.2 00/23] Fixes for the CI in the 7.2 stable branch

[Michael Tokarev]

03.12.2024 13:53, Thomas Huth пишет:
> The original motivation for this series was to fix the broken
> Cirrus-CI jobs in the 7.2 stable branch, so we don't waste
> precious CI credits on the non-working jobs. Though I was able
> to get it compile again by updating the jobs to the latest
> versions of FreeBSD and macOS by cherrypicking the corresponding
> patches, the "make check" step is still completely FUBAR, so
> until someone has enough spare time, the last patch now simply
> disables these jobs in the CI to avoid the wasting of the CI
> credits.
>
> Anyway, I've picked up some other CI patches along the way, so
> this series fixes at least most of the other CI jobs in gitlab
> now (essentially by updating most runners to Debian bookworm now).


I really wonder.  With all the conflicts in there and manual
tweaking, - maybe it's better to pick some intermediate changes
too?  For example, patch "update debian i686 and mipsel images
to bookworm" basically becomes a half, b/c there's no aa5730b07e
"tests/docker: replace fedora-i386 with debian-i686" which can
be picked up just fine.  And there are quite a few of similar
changes which makes things much closer to what we have in master
now, so new changes can be applied more easily too.  Not that
I'm asking you to do so, - more like thinking out loud.

The fact that I picked up some later patches to 7.2 already
(like removing debian armel container, which is referenced
in every 2nd patch in Conflicts:), does not make life easier :) --
*this* is what I had in mind when mentioning "what a mess".

How did you pick patches for docker files?  For example, the change
I already wondered about - "Drop support for macOS 13 (Ventura)" -
the original commit has different change in macos-13.vars, in
PKGS='' list.  Ditto for "Upgrade macOS to 13 (Ventura)" change -
it had different resulting PKGS in there than the original change;
but this file is auto-generated...

I applied whole */23 thing with a few very minor tweaks in
commit messages (like this one, or removing extra added empty
line, or adding a reference to commit which removed armel-cross
dockerfile).  The result seems okay'ish, but the whole feeling
of all this.. different.

I tried picking some missing bits for 8.2 too, since it too
has the same problem.  With a bit of luck it might become
much easier.  Bit I'll see.

b4358ed4fd29c Update FreeBSD CI jobs FreeBSD 14.1
cc6cb422e0959 .gitlab-ci.d/cirrus: Remove the netbsd and openbsd jobs
de11da6448ca4 .gitlab-ci.d/cirrus: Drop support for macOS 13 (Ventura)
aa54f5be44be7 tests: update lcitool to fix freebsd py311-yaml rename

this is a list of things which you picked for 7.2 but which
are missing in 8.2.  And the last change (Cirrus-CI and MSYS2
in the 7.2 branch) is obviously also missing.

Thanks,

/mjt