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>

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 7e6c16e4b6009e1de5ad85f6d111058ebc32159c..1292f9874e09c75cdd9413f4a8ede1d54fabd773 100644 (file)
--- 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 d6738715166c9cb4b8c8449558d5910961bdabb4..b45aab5ceb148d054f907e809b5f19664e199275 100644 (file)
--- 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 ab55ae98c309688ea08ca8a0604debb63162a144..96f8d3fb43aa21dd223da1975b6ffd6e77ab3446 100644 (file)
--- 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 2c775f585207e5c3ee77368514257500e3ac4dff..3be84a2106e7311d36a63c72f3df913b7386fce3 100644 (file)
--- 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 1a5429e3bccd0df3fbf563ca6439e71813bfac7f..85d699bfae5f1dd398a2f2983e85c9281c71f252 100644 (file)
--- 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