From 2bb0efa367f4759a9469327775e4aaac76ebec0a Mon Sep 17 00:00:00 2001
From: Erik Skultety <eskultet@redhat.com>
Date: Tue, 2 May 2023 17:10:34 +0200
Subject: [PATCH] ci: Flip mingw jobs from Fedora 37 to Fedora 38

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
---
 ...-mingw32.sh => fedora-38-cross-mingw32.sh} |  0
 ...-mingw64.sh => fedora-38-cross-mingw64.sh} |  0
 ...ile => fedora-38-cross-mingw32.Dockerfile} |  2 +-
 ...ile => fedora-38-cross-mingw64.Dockerfile} |  2 +-
 ci/gitlab/builds.yml                          | 24 +++++++++----------
 ci/gitlab/containers.yml                      |  8 +++----
 ci/manifest.yml                               | 10 ++++----
 7 files changed, 23 insertions(+), 23 deletions(-)
 rename ci/buildenv/{fedora-37-cross-mingw32.sh => fedora-38-cross-mingw32.sh} (100%)
 rename ci/buildenv/{fedora-37-cross-mingw64.sh => fedora-38-cross-mingw64.sh} (100%)
 rename ci/containers/{fedora-37-cross-mingw32.Dockerfile => fedora-38-cross-mingw32.Dockerfile} (98%)
 rename ci/containers/{fedora-37-cross-mingw64.Dockerfile => fedora-38-cross-mingw64.Dockerfile} (98%)

diff --git a/ci/buildenv/fedora-37-cross-mingw32.sh b/ci/buildenv/fedora-38-cross-mingw32.sh
similarity index 100%
rename from ci/buildenv/fedora-37-cross-mingw32.sh
rename to ci/buildenv/fedora-38-cross-mingw32.sh
diff --git a/ci/buildenv/fedora-37-cross-mingw64.sh b/ci/buildenv/fedora-38-cross-mingw64.sh
similarity index 100%
rename from ci/buildenv/fedora-37-cross-mingw64.sh
rename to ci/buildenv/fedora-38-cross-mingw64.sh
diff --git a/ci/containers/fedora-37-cross-mingw32.Dockerfile b/ci/containers/fedora-38-cross-mingw32.Dockerfile
similarity index 98%
rename from ci/containers/fedora-37-cross-mingw32.Dockerfile
rename to ci/containers/fedora-38-cross-mingw32.Dockerfile
index 7e6c16e4b6..1292f9874e 100644
--- a/ci/containers/fedora-37-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw32.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:37
+FROM registry.fedoraproject.org/fedora:38
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
diff --git a/ci/containers/fedora-37-cross-mingw64.Dockerfile b/ci/containers/fedora-38-cross-mingw64.Dockerfile
similarity index 98%
rename from ci/containers/fedora-37-cross-mingw64.Dockerfile
rename to ci/containers/fedora-38-cross-mingw64.Dockerfile
index d673871516..b45aab5ceb 100644
--- a/ci/containers/fedora-37-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw64.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:37
+FROM registry.fedoraproject.org/fedora:38
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index ab55ae98c3..96f8d3fb43 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -746,46 +746,46 @@ s390x-debian-sid-local-env:
     NAME: debian-sid
 
 
-mingw32-fedora-37-prebuilt-env:
+mingw32-fedora-38-prebuilt-env:
   extends: .cross_build_job_prebuilt_env
   needs:
-    - job: mingw32-fedora-37-container
+    - job: mingw32-fedora-38-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw32
     JOB_OPTIONAL: 1
-    NAME: fedora-37
+    NAME: fedora-38
 
-mingw32-fedora-37-local-env:
+mingw32-fedora-38-local-env:
   extends: .cross_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CROSS: mingw32
-    IMAGE: registry.fedoraproject.org/fedora:37
+    IMAGE: registry.fedoraproject.org/fedora:38
     JOB_OPTIONAL: 1
-    NAME: fedora-37
+    NAME: fedora-38
 
 
-mingw64-fedora-37-prebuilt-env:
+mingw64-fedora-38-prebuilt-env:
   extends: .cross_build_job_prebuilt_env
   needs:
-    - job: mingw64-fedora-37-container
+    - job: mingw64-fedora-38-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-37
+    NAME: fedora-38
 
-mingw64-fedora-37-local-env:
+mingw64-fedora-38-local-env:
   extends: .cross_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CROSS: mingw64
-    IMAGE: registry.fedoraproject.org/fedora:37
-    NAME: fedora-37
+    IMAGE: registry.fedoraproject.org/fedora:38
+    NAME: fedora-38
 
 
 mingw32-fedora-rawhide-prebuilt-env:
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 2c775f5852..3be84a2106 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -235,19 +235,19 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-37-container:
+mingw32-fedora-38-container:
   extends: .container_job
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: fedora-37-cross-mingw32
+    NAME: fedora-38-cross-mingw32
 
 
-mingw64-fedora-37-container:
+mingw64-fedora-38-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-37-cross-mingw64
+    NAME: fedora-38-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 1a5429e3bc..85d699bfae 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -124,11 +124,6 @@ targets:
           paths:
             - libvirt-rpms
 
-      - arch: mingw32
-        builds: false
-
-      - arch: mingw64
-
   fedora-38:
     jobs:
       - arch: x86_64
@@ -137,6 +132,11 @@ targets:
           paths:
             - libvirt-rpms
 
+      - arch: mingw32
+        builds: false
+
+      - arch: mingw64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64