[libvirt PATCH 0/2] ci: Tiny changes to the Makefile
Erik Skultety (2): ci: Drop the CI_PREPARE_SCRIPT variable ci: Makefile: Expose CI_IMAGE_PREFIX and CI_IMAGE_TAG in 'ci-help' ci/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.29.2
In commit 321293e2 I dropped the prepare.sh script, but forgot to remove the corresponding variable from the Makefile. Signed-off-by: Erik Skultety <eskultet@redhat.com> --- ci/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 7bbff3e9aa..94a4bf62c7 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -20,9 +20,6 @@ CI_HOST_SRCDIR = $(CI_SCRATCHDIR)/src # the $(CI_HOST_SRCDIR) directory from the host CI_CONT_SRCDIR = $(CI_USER_HOME)/libvirt -# Script containing environment preparation steps -CI_PREPARE_SCRIPT = $(CI_ROOTDIR)/prepare.sh - # Script containing build instructions CI_BUILD_SCRIPT = $(CI_ROOTDIR)/build.sh -- 2.29.2
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 <eskultet@redhat.com> --- 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 -- 2.29.2
On Mon, 2021-02-15 at 13:11 +0100, Erik Skultety wrote:
Erik Skultety (2): ci: Drop the CI_PREPARE_SCRIPT variable ci: Makefile: Expose CI_IMAGE_PREFIX and CI_IMAGE_TAG in 'ci-help'
ci/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Erik Skultety