Re: [PATCH 2/3] gitlab: use $MAKE instead of 'make'

[Philippe Mathieu-Daudé]

On 13/5/24 13:15, Daniel P. Berrangé wrote:

The lcitool generated containers have '$MAKE' set to the path
of the right 'make' binary. Using the env variable makes it
possible to override the choice per job.

Signed-off-by: Daniel P. Berrangé 
---
  .gitlab-ci.d/buildtest-template.yml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé 

Re: [PATCH 2/3] gitlab: use $MAKE instead of 'make'

[Thomas Huth]

On 13/05/2024 13.15, Daniel P. Berrangé wrote:

The lcitool generated containers have '$MAKE' set to the path
of the right 'make' binary. Using the env variable makes it
possible to override the choice per job.

Signed-off-by: Daniel P. Berrangé 
---
  .gitlab-ci.d/buildtest-template.yml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Thomas Huth 

[PATCH 2/3] gitlab: use $MAKE instead of 'make'

[Daniel P . Berrangé]

The lcitool generated containers have '$MAKE' set to the path
of the right 'make' binary. Using the env variable makes it
possible to override the choice per job.

Signed-off-by: Daniel P. Berrangé 
---
 .gitlab-ci.d/buildtest-template.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.d/buildtest-template.yml 
b/.gitlab-ci.d/buildtest-template.yml
index 22045add80..278a5ea966 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -26,10 +26,10 @@
   then
 pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ;
   fi || exit 1;
-- make -j"$JOBS"
+- $MAKE -j"$JOBS"
 - if test -n "$MAKE_CHECK_ARGS";
   then
-make -j"$JOBS" $MAKE_CHECK_ARGS ;
+$MAKE -j"$JOBS" $MAKE_CHECK_ARGS ;
   fi
 - ccache --show-stats
 
@@ -60,7 +60,7 @@
 - cd build
 - find . -type f -exec touch {} +
 # Avoid recompiling by hiding ninja with NINJA=":"
-- make NINJA=":" $MAKE_CHECK_ARGS
+- $MAKE NINJA=":" $MAKE_CHECK_ARGS
 
 .native_test_job_template:
   extends: .common_test_job_template
-- 
2.43.0