[libvirt PATCH v2 4/7] ci: Move MinGW jobs to Fedora 36

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ...gw32.Dockerfile => fedora-36-cross-mingw32.Dockerfile} | 2 +- ...gw64.Dockerfile => fedora-36-cross-mingw64.Dockerfile} | 2 +- ci/gitlab/builds.yml | 6 +++--- ci/gitlab/containers.yml | 8 ++++---- ci/manifest.yml | 6 ++++-- 5 files changed, 13 insertions(+), 11 deletions(-) rename ci/containers/{fedora-35-cross-mingw32.Dockerfile => fedora-36-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-35-cross-mingw64.Dockerfile => fedora-36-cross-mingw64.Dockerfile} (98%) diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-36-cross-mingw32.Dockerfile similarity index 98% rename from ci/containers/fedora-35-cross-mingw32.Dockerfile rename to ci/containers/fedora-36-cross-mingw32.Dockerfile index 3cc5e7b59b..76659d696a 100644 --- a/ci/containers/fedora-35-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-36-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:36 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-36-cross-mingw64.Dockerfile similarity index 98% rename from ci/containers/fedora-35-cross-mingw64.Dockerfile rename to ci/containers/fedora-36-cross-mingw64.Dockerfile index b6662f6da7..0bccf0738c 100644 --- a/ci/containers/fedora-35-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-36-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:36 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index b55143018b..d136b0776e 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -334,15 +334,15 @@ s390x-debian-sid: NAME: debian-sid -mingw64-fedora-35: +mingw64-fedora-36: extends: .cross_build_job needs: - - job: mingw64-fedora-35-container + - job: mingw64-fedora-36-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-35 + NAME: fedora-36 mingw32-fedora-rawhide: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 635bc516e3..5b8a91c295 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -297,18 +297,18 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-35-container: +mingw32-fedora-36-container: extends: .container_job allow_failure: true variables: - NAME: fedora-35-cross-mingw32 + NAME: fedora-36-cross-mingw32 -mingw64-fedora-35-container: +mingw64-fedora-36-container: extends: .container_job allow_failure: false variables: - NAME: fedora-35-cross-mingw64 + NAME: fedora-36-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 8c43d2e917..e85a01018e 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -152,14 +152,16 @@ targets: paths: - libvirt-rpms + fedora-36: + jobs: + - arch: x86_64 + - arch: mingw32 allow-failure: true builds: false - arch: mingw64 - fedora-36: x86_64 - fedora-rawhide: jobs: - arch: x86_64 -- 2.35.3