From 23e99e264cd87ea17c59b7628508baf1aa43ec64 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Thu, 13 Jun 2024 15:51:38 +0000 Subject: [PATCH] ci: fix the expected yq version string I get: ~/gopath/bin/yq --version yq (https://github.com/mikefarah/yq/) version v4.40.7 Also add support for set -o xtrace to install_yq.sh. Signed-off-by: Dan Mihai --- ci/install_yq.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/install_yq.sh b/ci/install_yq.sh index cf5b9a5137..e33537a596 100755 --- a/ci/install_yq.sh +++ b/ci/install_yq.sh @@ -5,6 +5,8 @@ # SPDX-License-Identifier: Apache-2.0 # +[ -n "$DEBUG" ] && set -o xtrace + # If we fail for any reason a message will be displayed die() { msg="$*" @@ -36,7 +38,7 @@ function install_yq() { fi fi fi - [ -x "${yq_path}" ] && [ "`${yq_path} --version`"X == "yq version ${yq_version}"X ] && return + [ -x "${yq_path}" ] && [ "`${yq_path} --version`"X == "yq (https://github.com/mikefarah/yq/) version ${yq_version}"X ] && return read -r -a sysInfo <<< "$(uname -sm)"