qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 03/11] gitlab: use $MAKE instead of 'make'
Date: Tue, 14 May 2024 14:51:11 +0200	[thread overview]
Message-ID: <20240514125119.284638-4-thuth@redhat.com> (raw)
In-Reply-To: <20240514125119.284638-1-thuth@redhat.com>

From: Daniel P. Berrangé <berrange@redhat.com>

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é <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240513111551.488088-3-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .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.45.0



  parent reply	other threads:[~2024-05-14 12:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-14 12:51 [PULL 00/11] gitlab CI fix and glib update Thomas Huth
2024-05-14 12:51 ` [PULL 01/11] configure: Fix error message when C compiler is not working Thomas Huth
2024-05-14 12:51 ` [PULL 02/11] dockerfiles: add 'MAKE' env variable to remaining containers Thomas Huth
2024-05-14 12:51 ` Thomas Huth [this message]
2024-05-14 12:51 ` [PULL 04/11] gitlab: use 'setarch -R' to workaround tsan bug Thomas Huth
2024-05-14 12:51 ` [PULL 05/11] Bump minimum glib version to v2.66 Thomas Huth
2024-05-14 12:51 ` [PULL 06/11] Remove glib compatibility code that is not required anymore Thomas Huth
2024-05-14 12:51 ` [PULL 07/11] block/gluster: Use URI parsing code from glib Thomas Huth
2024-05-14 12:51 ` [PULL 08/11] block/nbd: " Thomas Huth
2024-05-14 12:51 ` [PULL 09/11] block/nfs: " Thomas Huth
2024-05-14 12:51 ` [PULL 10/11] block/ssh: " Thomas Huth
2024-05-14 12:51 ` [PULL 11/11] util/uri: Remove the old URI parsing code Thomas Huth
2024-05-15  6:51 ` [PULL 00/11] gitlab CI fix and glib update Richard Henderson
2024-05-15 10:39 ` Daniel P. Berrangé
2024-05-27 19:09   ` Michael Tokarev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240514125119.284638-4-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).