ci: Move MinGW jobs to Fedora 36

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-05-26 08:39:10 +02:00
parent a6f7ed6e72
commit 1234ea1d38
5 changed files with 13 additions and 11 deletions

View File

@ -4,7 +4,7 @@
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:35 FROM registry.fedoraproject.org/fedora:36
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\ echo -e '#!/bin/sh\n\

View File

@ -4,7 +4,7 @@
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:35 FROM registry.fedoraproject.org/fedora:36
RUN dnf install -y nosync && \ RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\ echo -e '#!/bin/sh\n\

View File

@ -334,15 +334,15 @@ s390x-debian-sid:
NAME: debian-sid NAME: debian-sid
mingw64-fedora-35: mingw64-fedora-36:
extends: .cross_build_job extends: .cross_build_job
needs: needs:
- job: mingw64-fedora-35-container - job: mingw64-fedora-36-container
optional: true optional: true
allow_failure: false allow_failure: false
variables: variables:
CROSS: mingw64 CROSS: mingw64
NAME: fedora-35 NAME: fedora-36
mingw32-fedora-rawhide: mingw32-fedora-rawhide:

View File

@ -297,18 +297,18 @@ s390x-debian-sid-container:
NAME: debian-sid-cross-s390x NAME: debian-sid-cross-s390x
mingw32-fedora-35-container: mingw32-fedora-36-container:
extends: .container_job extends: .container_job
allow_failure: true allow_failure: true
variables: variables:
NAME: fedora-35-cross-mingw32 NAME: fedora-36-cross-mingw32
mingw64-fedora-35-container: mingw64-fedora-36-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
variables: variables:
NAME: fedora-35-cross-mingw64 NAME: fedora-36-cross-mingw64
mingw32-fedora-rawhide-container: mingw32-fedora-rawhide-container:

View File

@ -152,14 +152,16 @@ targets:
paths: paths:
- libvirt-rpms - libvirt-rpms
fedora-36:
jobs:
- arch: x86_64
- arch: mingw32 - arch: mingw32
allow-failure: true allow-failure: true
builds: false builds: false
- arch: mingw64 - arch: mingw64
fedora-36: x86_64
fedora-rawhide: fedora-rawhide:
jobs: jobs:
- arch: x86_64 - arch: x86_64