From 8761bffcafd39a99a4fdadf919f7a8d15c46aa2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Tue, 20 Feb 2024 11:20:01 +0100 Subject: [PATCH] Makefile: Pass PAGER/GIT_PAGER variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow to override the PAGER/GIT_PAGER variables inside the container. Use `cat` as pager when running in Github Actions (to avoid things like `git diff` stalling the CI). Signed-off-by: Paweł Gronowski --- .github/workflows/test.yml | 2 ++ Makefile | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e69dba43f6..63da07eee2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,8 @@ on: env: GO_VERSION: "1.21.7" + GIT_PAGER: "cat" + PAGER: "cat" jobs: validate-dco: diff --git a/Makefile b/Makefile index 99c8edbd57..ff05c0762b 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,9 @@ export VALIDATE_REPO export VALIDATE_BRANCH export VALIDATE_ORIGIN_BRANCH +export PAGER +export GIT_PAGER + # env vars passed through directly to Docker's build scripts # to allow things like `make KEEPBUNDLE=1 binary` easily # `project/PACKAGERS.md` have some limited documentation of some of these @@ -77,6 +80,8 @@ DOCKER_ENVS := \ -e DEFAULT_PRODUCT_LICENSE \ -e PRODUCT \ -e PACKAGER_NAME \ + -e PAGER \ + -e GIT_PAGER \ -e OTEL_EXPORTER_OTLP_ENDPOINT \ -e OTEL_EXPORTER_OTLP_PROTOCOL \ -e OTEL_SERVICE_NAME