Skip to content

Commit d488e25

Browse files
berrangeMichael Tokarev
authored andcommitted
gitlab: use $MAKE instead of 'make'
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é <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]> (cherry picked from commit c53f7a1) Signed-off-by: Michael Tokarev <[email protected]>
1 parent 8fe634f commit d488e25

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.gitlab-ci.d/buildtest-template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
then
2727
pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ;
2828
fi || exit 1;
29-
- make -j"$JOBS"
29+
- $MAKE -j"$JOBS"
3030
- if test -n "$MAKE_CHECK_ARGS";
3131
then
32-
make -j"$JOBS" $MAKE_CHECK_ARGS ;
32+
$MAKE -j"$JOBS" $MAKE_CHECK_ARGS ;
3333
fi
3434
- ccache --show-stats
3535

@@ -60,7 +60,7 @@
6060
- cd build
6161
- find . -type f -exec touch {} +
6262
# Avoid recompiling by hiding ninja with NINJA=":"
63-
- make NINJA=":" $MAKE_CHECK_ARGS
63+
- $MAKE NINJA=":" $MAKE_CHECK_ARGS
6464

6565
.native_test_job_template:
6666
extends: .common_test_job_template

0 commit comments

Comments
 (0)