[libvirt PATCH 11/11] ci: Build RPMs on MinGW

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 .gitlab-ci.yml | 11 ++++++++---
 ci/jobs.sh     | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cdabed941..42c43a556e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/ci/jobs.sh b/ci/jobs.sh
index ba522258a1..8f7748aab8 100644
--- a/ci/jobs.sh
+++ b/ci/jobs.sh
@@ -72,10 +72,27 @@ run_potfile() {
 
 run_rpmbuild() {
     run_dist
+
+    case "$CROSS" in
+    mingw32)
+        without_feature1="_without_native 1"
+        without_feature2="_without_mingw64 1"
+        ;;
+    mingw64)
+        without_feature1="_without_native 1"
+        without_feature2="_without_mingw32 1"
+        ;;
+    *)
+        without_feature1="_without_mingw32 1"
+        without_feature2="_without_mingw64 1"
+        ;;
+    esac
+
     run_cmd rpmbuild \
                 --clean \
                 --nodeps \
-                --define "_without_mingw 1" \
+                --define "$without_feature1" \
+                --define "$without_feature2" \
                 -ta build/meson-dist/libvirt-*.tar.xz
 }
 
-- 
2.41.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux