Skip to content
Snippets Groups Projects
Commit 6e3d73b6 authored by Björn Dieding's avatar Björn Dieding
Browse files

fix: Update variable name in ci_helm_get_chart_version function

parent c40fbb39
Branches
Tags
No related merge requests found
...@@ -14,12 +14,15 @@ if [[ -v AGENT_NAME ]]; then ...@@ -14,12 +14,15 @@ if [[ -v AGENT_NAME ]]; then
if [[ ! -v CI_COMMIT_BRANCH ]]; then if [[ ! -v CI_COMMIT_BRANCH ]]; then
CI_COMMIT_BRANCH="${BUILD_SOURCEBRANCH}" CI_COMMIT_BRANCH="${BUILD_SOURCEBRANCH}"
fi fi
if [[ ! -v CI_COMMIT_BRANCH ]]; then if [[ ! -v CI_COMMIT_MESSAGE ]]; then
BUILD_SOURCEVERSIONMESSAGE="${BUILD_SOURCEVERSIONMESSAGE}" CI_COMMIT_MESSAGE="${BUILD_SOURCEVERSIONMESSAGE}"
fi fi
if [[ ! -v CI_COMMIT_REF_SLUG ]]; then if [[ ! -v CI_COMMIT_REF_SLUG ]]; then
echo "[warning] Azure will not set the branch name. Please set CI_COMMIT_REF_SLUG" if [[ -v CI_COMMIT_TAG ]]; then
CI_COMMIT_REF_SLUG="${BUILD_SOURCEBRANCHNAME}" CI_COMMIT_REF_SLUG="${CI_COMMIT_TAG}"
else
CI_COMMIT_REF_SLUG="${BUILD_SOURCEBRANCHNAME}"
fi
fi fi
if [[ ! -v CI_COMMIT_SHA ]]; then if [[ ! -v CI_COMMIT_SHA ]]; then
CI_COMMIT_SHA="${BUILD_SOURCEVERSION}" CI_COMMIT_SHA="${BUILD_SOURCEVERSION}"
......
...@@ -471,12 +471,12 @@ function ci_helm_get_release_tag() { ...@@ -471,12 +471,12 @@ function ci_helm_get_release_tag() {
} }
function ci_helm_get_chart_version() { function ci_helm_get_chart_version() {
local chart="${1:-./chart/}" local chart_ref="${1:-./chart/}"
local chart_version="" local chart_version=""
if [[ ! -f "${chart}Chart.yaml" ]]; then if [[ ! -f "${chart_ref}Chart.yaml" ]]; then
chart_version="$(cat ${chart}Chart.yaml | sed 's/^version: ([0-9\.]*)$/\1/p' -E -n )" chart_version="$(cat ${chart}Chart.yaml | sed 's/^version: ([0-9\.]*)$/\1/p' -E -n )"
else else
chart_version=$( sed -E 's/(.*):(.*)/\2/g;' <<< $chart ) chart_version=$( sed -E 's/(.*):(.*)/\2/g;' <<< $chart_ref )
fi fi
echo "$chart_version" echo "$chart_version"
return 0 return 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment