diff options
author | Erik Skultety <eskultet@redhat.com> | 2023-05-02 17:10:34 +0200 |
---|---|---|
committer | Erik Skultety <eskultet@redhat.com> | 2023-05-10 16:41:21 +0200 |
commit | 2bb0efa367f4759a9469327775e4aaac76ebec0a (patch) | |
tree | a16a5940b660daa80d4cc97e0087898ba2126fd9 | |
parent | ffd2a9707061819e9f0a96f7276a03f282a1fd0a (diff) | |
download | libvirt-2bb0efa367f4759a9469327775e4aaac76ebec0a.tar.gz |
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>
-rw-r--r-- | ci/buildenv/fedora-38-cross-mingw32.sh (renamed from ci/buildenv/fedora-37-cross-mingw32.sh) | 0 | ||||
-rw-r--r-- | ci/buildenv/fedora-38-cross-mingw64.sh (renamed from ci/buildenv/fedora-37-cross-mingw64.sh) | 0 | ||||
-rw-r--r-- | ci/containers/fedora-38-cross-mingw32.Dockerfile (renamed from ci/containers/fedora-37-cross-mingw32.Dockerfile) | 2 | ||||
-rw-r--r-- | ci/containers/fedora-38-cross-mingw64.Dockerfile (renamed from ci/containers/fedora-37-cross-mingw64.Dockerfile) | 2 | ||||
-rw-r--r-- | ci/gitlab/builds.yml | 24 | ||||
-rw-r--r-- | ci/gitlab/containers.yml | 8 | ||||
-rw-r--r-- | ci/manifest.yml | 10 |
7 files changed, 23 insertions, 23 deletions
diff --git a/ci/buildenv/fedora-37-cross-mingw32.sh b/ci/buildenv/fedora-38-cross-mingw32.sh index a45c84802f..a45c84802f 100644 --- a/ci/buildenv/fedora-37-cross-mingw32.sh +++ b/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 index 1e2b2bace2..1e2b2bace2 100644 --- a/ci/buildenv/fedora-37-cross-mingw64.sh +++ b/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 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 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 |