From 639c393474c63878b04a8132037bd8ae529f0e8e Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Tue, 30 Apr 2024 13:01:08 +0200 Subject: [PATCH] fix: ci always put short commit id --- .github/workflows/publish-helm.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml index f33b5a2..c9c1ea1 100644 --- a/.github/workflows/publish-helm.yml +++ b/.github/workflows/publish-helm.yml @@ -40,8 +40,6 @@ jobs: # Enable pipefail so git command failures do not result in null versions downstream set -x - echo "SHA_SHORT=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_ENV - echo "APP_VERSION=$(\ git ls-remote --tags --refs --sort="v:refname" \ https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' \ @@ -57,7 +55,7 @@ jobs: echo "CHART_VERSION=0.$(\ git ls-remote --tags --refs --sort="v:refname" \ - https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | sed 's/.\{3\}/&-/')" >> $GITHUB_OUTPUT + https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | sed 's/.\{3\}/&-/')-$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT # 0.0.1-a7-1tr5hrt fi @@ -67,7 +65,7 @@ jobs: run: | for chart in $(find charts -name Chart.yaml); do sed -i "s,{{APP_VERSION}},${{ steps.get_version.outputs.APP_VERSION }}," $chart - sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.CHART_VERSION }}-${SHA_SHORT}," $chart + sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.CHART_VERSION }}," $chart done - id: publish-chart