From f1157ee5308fb478e5ce25355de049c55387a494 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Mon, 15 Feb 2021 13:07:08 +0100 Subject: [PATCH] ci: Makefile: Expose CI_IMAGE_PREFIX and CI_IMAGE_TAG in 'ci-help' Using locally built images is a useful feature; our commentaries even mention overriding them may be useful in some scenarios. Expose the variables in the help to let users know they can use the feature. Formatting would definitely break, so this patch adds more spacing for proper alignment. Signed-off-by: Erik Skultety Reviewed-by: Andrea Bolognani --- ci/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 94a4bf62c7..c4585ae95d 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -235,10 +235,12 @@ ci-help: @echo @echo "Available make variables:" @echo - @echo " CI_CLEAN=0 - do not delete '$(CI_SCRATCHDIR)' after completion" - @echo " CI_REUSE=1 - re-use existing '$(CI_SCRATCHDIR)' content" - @echo " CI_ENGINE=auto - container engine to use (podman, docker)" - @echo " CI_USER_LOGIN= - which user should run in the container (default is $$USER)" - @echo " CI_MESON_ARGS= - extra arguments passed to meson" - @echo " CI_NINJA_ARGS= - extra arguments passed to ninja" + @echo " CI_CLEAN=0 - do not delete '$(CI_SCRATCHDIR)' after completion" + @echo " CI_REUSE=1 - re-use existing '$(CI_SCRATCHDIR)' content" + @echo " CI_ENGINE=auto - container engine to use (podman, docker)" + @echo " CI_USER_LOGIN= - which user should run in the container (default is $$USER)" + @echo " CI_IMAGE_PREFIX= - override to prefer a locally built image, (default is $(CI_IMAGE_PREFIX))" + @echo " CI_IMAGE_TAG=:latest - optionally use in conjunction with 'CI_IMAGE_PREFIX'" + @echo " CI_MESON_ARGS= - extra arguments passed to meson" + @echo " CI_NINJA_ARGS= - extra arguments passed to ninja" @echo