[incubator-heron] branch master updated: Updated to allow for external Helm version when building on a non-versioned branch (#3708)

[ni...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b2a4e82  Updated to allow for external Helm version when building on a non-versioned branch (#3708)
b2a4e82 is described below

commit b2a4e828569c0445a758ca9f3780600a0855e665
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Wed Sep 1 23:27:38 2021 -0400

    Updated to allow for external Helm version when building on a non-versioned branch (#3708)
---
 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",