From c54bfc4adfd617f00b8237bbe05fad5d0abf4c61 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 4 Mar 2021 13:58:13 -0800 Subject: [PATCH 1/2] disable colors in zeitgeist so as not to break shell2junit --- hack/verify-external-dependencies-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/verify-external-dependencies-version.sh b/hack/verify-external-dependencies-version.sh index 1fe2e90fbef..56f18f7eeb6 100755 --- a/hack/verify-external-dependencies-version.sh +++ b/hack/verify-external-dependencies-version.sh @@ -38,7 +38,7 @@ cd - # Prefer full path for running zeitgeist ZEITGEIST_BIN="$(which zeitgeist)" -"${ZEITGEIST_BIN}" validate \ +CLICOLOR=0 "${ZEITGEIST_BIN}" validate \ --local \ --base-path "${KUBE_ROOT}" \ --config "${KUBE_ROOT}"/build/dependencies.yaml From fbfbe289c4275a0cdb96c10c2a7ed06c43ee8ca4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 4 Mar 2021 14:52:32 -0800 Subject: [PATCH 2/2] use sed to drop escape codes from zeitgeist output --- hack/verify-external-dependencies-version.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/verify-external-dependencies-version.sh b/hack/verify-external-dependencies-version.sh index 56f18f7eeb6..7df08058a64 100755 --- a/hack/verify-external-dependencies-version.sh +++ b/hack/verify-external-dependencies-version.sh @@ -38,7 +38,9 @@ cd - # Prefer full path for running zeitgeist ZEITGEIST_BIN="$(which zeitgeist)" +# TODO: revert sed hack when zetigeist respects CLICOLOR/ttys CLICOLOR=0 "${ZEITGEIST_BIN}" validate \ --local \ --base-path "${KUBE_ROOT}" \ - --config "${KUBE_ROOT}"/build/dependencies.yaml + --config "${KUBE_ROOT}"/build/dependencies.yaml \ + 2> >(sed -e $'s/\x1b\[[0-9;]*m//g' >&2)