[libvirt PATCH v2 7/9] gitlab: add variable for make command name

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

 



To facilitate future jobs that will use FreeBSD

Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58abcbe1f3..9814b6580a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,9 @@ stages:
   - cross_build
   - native_build_extra
 
+variables:
+  MAKE: make
+
 
 # Common templates
 
@@ -14,8 +17,8 @@ stages:
     - mkdir build
     - cd build
     - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1)
-    - make -j $(getconf _NPROCESSORS_ONLN) syntax-check
-    - make -j $(getconf _NPROCESSORS_ONLN) distcheck
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) syntax-check
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) distcheck
 
 # Native jobs that will only run post merge on master branch
 # Switch to running against merge requests later
@@ -36,7 +39,7 @@ stages:
     - mkdir build
     - cd build
     - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1)
-    - make -j $(getconf _NPROCESSORS_ONLN)
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN)
 
 
 # Native architecture build + test jobs
@@ -120,8 +123,8 @@ website:
     - mkdir build
     - cd build
     - ../autogen.sh --prefix=$(pwd)/../vroot || (cat config.log && exit 1)
-    - make -j $(getconf _NPROCESSORS_ONLN) -C docs
-    - make -j $(getconf _NPROCESSORS_ONLN) -C docs install
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C docs
+    - $MAKE -j $(getconf _NPROCESSORS_ONLN) -C docs install
     - cd ..
     - mv vroot/share/doc/libvirt/html/ website
   image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest
-- 
2.24.1





[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