ci: Build RPMs on MinGW

Now that the spec file supports selectively disabling the native,
mingw32 and mingw64 parts, we can add coverage for the MinGW RPM
builds.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Andrea Bolognani 2023-11-02 11:16:20 +01:00
parent eb6552d98b
commit 717790adde
2 changed files with 30 additions and 4 deletions

View File

@ -57,10 +57,15 @@ include:
key: "$CI_JOB_NAME"
script:
- source ci/jobs.sh
- run_build
- if test "$CROSS" = "i686" ;
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
then
run_test;
run_rpmbuild;
else
run_build;
if test "$CROSS" = "i686";
then
run_test;
fi;
fi
.cross_build_job_prebuilt_env:

View File

@ -72,10 +72,31 @@ run_potfile() {
run_rpmbuild() {
run_dist
# The spec file supports three types of builds: native, mingw32
# and mingw64. By default they're all enabled, but each of the
# containers in which our CI jobs are executed is only set up for
# one of them, so we have to explicitly disable the other two.
case "$CROSS" in
mingw32)
build1="native"
build2="mingw64"
;;
mingw64)
build1="native"
build2="mingw32"
;;
*)
build1="mingw32"
build2="mingw64"
;;
esac
run_cmd rpmbuild \
--clean \
--nodeps \
--define "_without_mingw 1" \
--define "_without_$build1 1" \
--define "_without_$build2 1" \
-ta build/meson-dist/libvirt-*.tar.xz
}