mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-28 02:15:46 +00:00
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:
parent
eb6552d98b
commit
717790adde
@ -57,10 +57,15 @@ include:
|
|||||||
key: "$CI_JOB_NAME"
|
key: "$CI_JOB_NAME"
|
||||||
script:
|
script:
|
||||||
- source ci/jobs.sh
|
- source ci/jobs.sh
|
||||||
- run_build
|
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
|
||||||
- if test "$CROSS" = "i686" ;
|
then
|
||||||
|
run_rpmbuild;
|
||||||
|
else
|
||||||
|
run_build;
|
||||||
|
if test "$CROSS" = "i686";
|
||||||
then
|
then
|
||||||
run_test;
|
run_test;
|
||||||
|
fi;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.cross_build_job_prebuilt_env:
|
.cross_build_job_prebuilt_env:
|
||||||
|
23
ci/jobs.sh
23
ci/jobs.sh
@ -72,10 +72,31 @@ run_potfile() {
|
|||||||
|
|
||||||
run_rpmbuild() {
|
run_rpmbuild() {
|
||||||
run_dist
|
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 \
|
run_cmd rpmbuild \
|
||||||
--clean \
|
--clean \
|
||||||
--nodeps \
|
--nodeps \
|
||||||
--define "_without_mingw 1" \
|
--define "_without_$build1 1" \
|
||||||
|
--define "_without_$build2 1" \
|
||||||
-ta build/meson-dist/libvirt-*.tar.xz
|
-ta build/meson-dist/libvirt-*.tar.xz
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user