Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982

Assumes that

  https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444

has been merged, which it hasn't yet, but I don't expect it to be
controversial.

I've added both macOS 13 and 14, doubling the amount of coverage. I'm
not aware of us being particularly tight on Cirrus CI credits, but if
that's the case we can just skip the macOS 13 patch.

The job environment is supposed to make the build system pick up
dependencies that are installed via Homebrew but can't be exposed by
default because they conflict with OS-supplied packages. Right now it
doesn't really do anything, because it hasn't been updated with the
switch to aarch64. I'm going to look into it later, but for now I've
left it as-is as reminder/documentation.

Andrea Bolognani (5):
  ci: Update generated files
  ci: Drop rpcgen override from macOS $PATH
  ci: Add macOS 13
  ci: Add macOS 14
  ci: Drop macOS 12

 ci/buildenv/almalinux-8.sh                    |  1 -
 ci/buildenv/alpine-317.sh                     |  1 -
 ci/buildenv/alpine-edge.sh                    |  1 -
 ci/buildenv/centos-stream-8.sh                |  1 -
 ci/buildenv/centos-stream-9.sh                |  1 -
 ci/buildenv/debian-11-cross-aarch64.sh        |  1 -
 ci/buildenv/debian-11-cross-armv6l.sh         |  1 -
 ci/buildenv/debian-11-cross-armv7l.sh         |  1 -
 ci/buildenv/debian-11-cross-i686.sh           |  1 -
 ci/buildenv/debian-11-cross-mips64el.sh       |  1 -
 ci/buildenv/debian-11-cross-mipsel.sh         |  1 -
 ci/buildenv/debian-11-cross-ppc64le.sh        |  1 -
 ci/buildenv/debian-11-cross-s390x.sh          |  1 -
 ci/buildenv/debian-11.sh                      |  1 -
 ci/buildenv/debian-12-cross-aarch64.sh        |  1 -
 ci/buildenv/debian-12-cross-armv6l.sh         |  1 -
 ci/buildenv/debian-12-cross-armv7l.sh         |  1 -
 ci/buildenv/debian-12-cross-i686.sh           |  1 -
 ci/buildenv/debian-12-cross-mips64el.sh       |  1 -
 ci/buildenv/debian-12-cross-mipsel.sh         |  1 -
 ci/buildenv/debian-12-cross-ppc64le.sh        |  1 -
 ci/buildenv/debian-12-cross-s390x.sh          |  1 -
 ci/buildenv/debian-12.sh                      |  1 -
 ci/buildenv/debian-sid-cross-aarch64.sh       |  1 -
 ci/buildenv/debian-sid-cross-armv6l.sh        |  1 -
 ci/buildenv/debian-sid-cross-armv7l.sh        |  1 -
 ci/buildenv/debian-sid-cross-i686.sh          |  1 -
 ci/buildenv/debian-sid-cross-mips64el.sh      |  1 -
 ci/buildenv/debian-sid-cross-ppc64le.sh       |  1 -
 ci/buildenv/debian-sid-cross-s390x.sh         |  1 -
 ci/buildenv/debian-sid.sh                     |  1 -
 ci/buildenv/fedora-37.sh                      |  1 -
 ci/buildenv/fedora-38-cross-mingw32.sh        |  2 +-
 ci/buildenv/fedora-38-cross-mingw64.sh        |  2 +-
 ci/buildenv/fedora-38.sh                      |  1 -
 ci/buildenv/fedora-rawhide-cross-mingw32.sh   |  2 +-
 ci/buildenv/fedora-rawhide-cross-mingw64.sh   |  2 +-
 ci/buildenv/fedora-rawhide.sh                 |  1 -
 ci/buildenv/opensuse-leap-15.sh               |  1 -
 ci/buildenv/opensuse-tumbleweed.sh            |  1 -
 ci/buildenv/ubuntu-2004.sh                    |  1 -
 ci/buildenv/ubuntu-2204.sh                    |  1 -
 ci/cirrus/{macos-12.vars => macos-13.vars}    |  2 +-
 ci/cirrus/{macos-12.vars => macos-14.vars}    |  2 +-
 ci/containers/almalinux-8.Dockerfile          |  1 -
 ci/containers/alpine-317.Dockerfile           |  1 -
 ci/containers/alpine-edge.Dockerfile          |  1 -
 ci/containers/centos-stream-8.Dockerfile      |  1 -
 ci/containers/centos-stream-9.Dockerfile      |  1 -
 .../debian-11-cross-aarch64.Dockerfile        |  1 -
 .../debian-11-cross-armv6l.Dockerfile         |  1 -
 .../debian-11-cross-armv7l.Dockerfile         |  1 -
 ci/containers/debian-11-cross-i686.Dockerfile |  1 -
 .../debian-11-cross-mips64el.Dockerfile       |  1 -
 .../debian-11-cross-mipsel.Dockerfile         |  1 -
 .../debian-11-cross-ppc64le.Dockerfile        |  1 -
 .../debian-11-cross-s390x.Dockerfile          |  1 -
 ci/containers/debian-11.Dockerfile            |  1 -
 .../debian-12-cross-aarch64.Dockerfile        |  1 -
 .../debian-12-cross-armv6l.Dockerfile         |  1 -
 .../debian-12-cross-armv7l.Dockerfile         |  1 -
 ci/containers/debian-12-cross-i686.Dockerfile |  1 -
 .../debian-12-cross-mips64el.Dockerfile       |  1 -
 .../debian-12-cross-mipsel.Dockerfile         |  1 -
 .../debian-12-cross-ppc64le.Dockerfile        |  1 -
 .../debian-12-cross-s390x.Dockerfile          |  1 -
 ci/containers/debian-12.Dockerfile            |  1 -
 .../debian-sid-cross-aarch64.Dockerfile       |  1 -
 .../debian-sid-cross-armv6l.Dockerfile        |  1 -
 .../debian-sid-cross-armv7l.Dockerfile        |  1 -
 .../debian-sid-cross-i686.Dockerfile          |  1 -
 .../debian-sid-cross-mips64el.Dockerfile      |  1 -
 .../debian-sid-cross-ppc64le.Dockerfile       |  1 -
 .../debian-sid-cross-s390x.Dockerfile         |  1 -
 ci/containers/debian-sid.Dockerfile           |  1 -
 ci/containers/fedora-37.Dockerfile            |  1 -
 .../fedora-38-cross-mingw32.Dockerfile        |  2 +-
 .../fedora-38-cross-mingw64.Dockerfile        |  2 +-
 ci/containers/fedora-38.Dockerfile            |  1 -
 .../fedora-rawhide-cross-mingw32.Dockerfile   |  2 +-
 .../fedora-rawhide-cross-mingw64.Dockerfile   |  2 +-
 ci/containers/fedora-rawhide.Dockerfile       |  1 -
 ci/containers/opensuse-leap-15.Dockerfile     |  1 -
 ci/containers/opensuse-tumbleweed.Dockerfile  |  1 -
 ci/containers/ubuntu-2004.Dockerfile          |  1 -
 ci/containers/ubuntu-2204.Dockerfile          |  1 -
 ci/gitlab/builds.yml                          | 24 +++++++++++++++----
 ci/manifest.yml                               | 11 +++++++--
 88 files changed, 39 insertions(+), 92 deletions(-)
 copy ci/cirrus/{macos-12.vars => macos-13.vars} (91%)
 rename ci/cirrus/{macos-12.vars => macos-14.vars} (91%)

-- 
2.41.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Mon, Nov 06, 2023 at 12:04:09PM +0100, Andrea Bolognani wrote:
> Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
> 
> Assumes that
> 
>   https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
> 
> has been merged, which it hasn't yet, but I don't expect it to be
> controversial.

You missed 442, which does the rpcgen change, and also fixes the
missing glusterfs packages on 32-bit debian.  Can you review that,
since it'll impact the very first patch here.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Mon, Nov 06, 2023 at 12:42:58PM +0000, Daniel P. Berrangé wrote:
> On Mon, Nov 06, 2023 at 12:04:09PM +0100, Andrea Bolognani wrote:
> > Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
> >
> > Assumes that
> >
> >   https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
> >
> > has been merged, which it hasn't yet, but I don't expect it to be
> > controversial.
>
> You missed 442, which does the rpcgen change, and also fixes the
> missing glusterfs packages on 32-bit debian.  Can you review that,
> since it'll impact the very first patch here.

Done.

Below is the range-diff output, are you okay with me squashing those
changes in or do you want me to respin?

1:  efaca61f0f ! 1:  cb98ea5298 ci: Update generated files
    @@ Metadata
      ## Commit message ##
         ci: Update generated files

    -    Gain native gettext for MinGW containers, lose rpcgen everywhere.
    +    Gain native gettext on MinGW, lose glusterfs on 32-bit
    +    architectures and rpcgen everywhere.

         Signed-off-by: Andrea Bolognani <abologna@redhat.com>

    @@ ci/buildenv/debian-sid-cross-armv6l.sh: function install_buildenv() {
                  libnbd-dev \
                  libxml2-utils \
                  locales \
    +@@ ci/buildenv/debian-sid-cross-armv6l.sh: function install_buildenv() {
    +             libdevmapper-dev:armel \
    +             libfuse-dev:armel \
    +             libglib2.0-dev:armel \
    +-            libglusterfs-dev:armel \
    +             libgnutls28-dev:armel \
    +             libiscsi-dev:armel \
    +             libnl-3-dev:armel \

      ## ci/buildenv/debian-sid-cross-armv7l.sh ##
     @@ ci/buildenv/debian-sid-cross-armv7l.sh: function install_buildenv() {
    @@ ci/buildenv/debian-sid-cross-armv7l.sh: function install_buildenv() {
                  libnbd-dev \
                  libxml2-utils \
                  locales \
    +@@ ci/buildenv/debian-sid-cross-armv7l.sh: function install_buildenv() {
    +             libdevmapper-dev:armhf \
    +             libfuse-dev:armhf \
    +             libglib2.0-dev:armhf \
    +-            libglusterfs-dev:armhf \
    +             libgnutls28-dev:armhf \
    +             libiscsi-dev:armhf \
    +             libnl-3-dev:armhf \

      ## ci/buildenv/debian-sid-cross-i686.sh ##
     @@ ci/buildenv/debian-sid-cross-i686.sh: function install_buildenv() {
    @@ ci/buildenv/debian-sid-cross-i686.sh: function install_buildenv() {
                  libnbd-dev \
                  libxml2-utils \
                  locales \
    +@@ ci/buildenv/debian-sid-cross-i686.sh: function install_buildenv() {
    +             libdevmapper-dev:i386 \
    +             libfuse-dev:i386 \
    +             libglib2.0-dev:i386 \
    +-            libglusterfs-dev:i386 \
    +             libgnutls28-dev:i386 \
    +             libiscsi-dev:i386 \
    +             libnl-3-dev:i386 \

      ## ci/buildenv/debian-sid-cross-mips64el.sh ##
     @@ ci/buildenv/debian-sid-cross-mips64el.sh: function install_buildenv() {
    @@ ci/containers/debian-sid-cross-armv6l.Dockerfile: RUN export
DEBIAN_FRONTEND=non
                            libnbd-dev \
                            libxml2-utils \
                            locales \
    +@@ ci/containers/debian-sid-cross-armv6l.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
    +                       libdevmapper-dev:armel \
    +                       libfuse-dev:armel \
    +                       libglib2.0-dev:armel \
    +-                      libglusterfs-dev:armel \
    +                       libgnutls28-dev:armel \
    +                       libiscsi-dev:armel \
    +                       libnl-3-dev:armel \

      ## ci/containers/debian-sid-cross-armv7l.Dockerfile ##
     @@ ci/containers/debian-sid-cross-armv7l.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
    @@ ci/containers/debian-sid-cross-armv7l.Dockerfile: RUN export
DEBIAN_FRONTEND=non
                            libnbd-dev \
                            libxml2-utils \
                            locales \
    +@@ ci/containers/debian-sid-cross-armv7l.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
    +                       libdevmapper-dev:armhf \
    +                       libfuse-dev:armhf \
    +                       libglib2.0-dev:armhf \
    +-                      libglusterfs-dev:armhf \
    +                       libgnutls28-dev:armhf \
    +                       libiscsi-dev:armhf \
    +                       libnl-3-dev:armhf \

      ## ci/containers/debian-sid-cross-i686.Dockerfile ##
     @@ ci/containers/debian-sid-cross-i686.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
    @@ ci/containers/debian-sid-cross-i686.Dockerfile: RUN export
DEBIAN_FRONTEND=nonin
                            libnbd-dev \
                            libxml2-utils \
                            locales \
    +@@ ci/containers/debian-sid-cross-i686.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
    +                       libdevmapper-dev:i386 \
    +                       libfuse-dev:i386 \
    +                       libglib2.0-dev:i386 \
    +-                      libglusterfs-dev:i386 \
    +                       libgnutls28-dev:i386 \
    +                       libiscsi-dev:i386 \
    +                       libnl-3-dev:i386 \

      ## ci/containers/debian-sid-cross-mips64el.Dockerfile ##
     @@ ci/containers/debian-sid-cross-mips64el.Dockerfile: RUN export
DEBIAN_FRONTEND=noninteractive && \
-- 
Andrea Bolognani / Red Hat / Virtualization
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

On Mon, Nov 06, 2023 at 07:38:13AM -0800, Andrea Bolognani wrote:
> On Mon, Nov 06, 2023 at 12:42:58PM +0000, Daniel P. Berrangé wrote:
> > On Mon, Nov 06, 2023 at 12:04:09PM +0100, Andrea Bolognani wrote:
> > > Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1062214982
> > >
> > > Assumes that
> > >
> > >   https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/444
> > >
> > > has been merged, which it hasn't yet, but I don't expect it to be
> > > controversial.
> >
> > You missed 442, which does the rpcgen change, and also fixes the
> > missing glusterfs packages on 32-bit debian.  Can you review that,
> > since it'll impact the very first patch here.
> 
> Done.
> 
> Below is the range-diff output, are you okay with me squashing those
> changes in or do you want me to respin?

Nah, looks to match what i expected, so

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org