This is an automated email from the ASF dual-hosted git repository.

nicknezis pushed a commit to branch nicknezis/helm-chart-version-fix
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git

commit 8534028bb40209a6c8f4c8e476ff8d2c6bbc4b58
Author: Nicholas Nezis <[email protected]>
AuthorDate: Mon Aug 30 21:21:43 2021 +0000

    Updated to allow for external Helm version when building on a non-versioned 
branch
---
 scripts/packages/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index 67a185d..2c8adc8 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -687,6 +687,7 @@ genrule(
         "export HERON_VERSION=$$(grep version $$RELEASE_FILE_DIR/$(location 
:release.yaml) | awk '{print $$3}')",
         'export HERON_VERSION=$$(echo $$HERON_VERSION | sed -e "s/^\'//" -e 
"s/\'$$//")',
         "export HERON_VERSION=$$(echo $$HERON_VERSION | grep 
\"[0-9]*\\.[0-9]*\\.[0-9]*\")",
+        'export HERON_VERSION=$$([[ ! -z $$HERON_VERSION_EXT ]] && echo 
$$HERON_VERSION_EXT || echo $$HERON_VERSION)',
         'export HERON_VERSION=$$([[ -z $$HERON_VERSION ]] && echo "0.0.0" || 
echo $$HERON_VERSION)',
         "mkdir -p $$TMP_DIR $$HELM_DIR heron-charts",
         "cp $(SRCS) $$HELM_DIR",

Reply via email to