51
51
echo "::set-output name=sha::${SHA}"
52
52
echo "::set-output name=repo::${GITHUB_REPOSITORY#*/}"
53
53
echo "::set-output name=branch::${GITHUB_REF##*/}"
54
+ echo "::set-output name=helmChartVersion::$(helm show chart ${HELM_CHART_DIR} | grep 'version:' | cut -d ' ' -f 2)"
54
55
- name : Build Binary
55
56
run : >
56
57
make binary
@@ -185,7 +186,7 @@ jobs:
185
186
cache-from : type=local,src=/tmp/.buildx-cache
186
187
cache-to : type=local,dest=/tmp/.buildx-cache
187
188
target : ${{ matrix.target }}
188
- tags : ${{ env.DOCKER_IMAGE }}/ ${{ needs.binary.outputs.version }}
189
+ tags : ${{ env.DOCKER_IMAGE }}: ${{ needs.binary.outputs.version }}
189
190
190
191
smoke-tests :
191
192
name : Smoke Tests
@@ -577,12 +578,12 @@ jobs:
577
578
- name : Lint
578
579
run : helm lint ${{ env.HELM_CHART_DIR }}
579
580
- name : Package
580
- run : helm package --version ${{ needs.binary.outputs.version }} ${{ env.HELM_CHART_DIR }}
581
+ run : helm package --version ${{ needs.binary.outputs.helmChartVersion }} ${{ env.HELM_CHART_DIR }}
581
582
- name : Upload Chart
582
583
uses : actions/upload-artifact@v2
583
584
with :
584
585
name : helm-chart
585
- path : ${{ github.workspace }}/nginx-ingress-${{ needs.binary.outputs.version }}.tgz
586
+ path : ${{ github.workspace }}/nginx-ingress-${{ needs.binary.outputs.helmChartVersion }}.tgz
586
587
587
588
release-helm :
588
589
name : Release Helm Chart
@@ -597,7 +598,7 @@ jobs:
597
598
fetch-depth : 1
598
599
token : ${{ secrets.NGINX_PAT }}
599
600
- name : Remove previous Chart
600
- run : rm -f ${{ github.workspace }}/stable/nginx-ingress-${{ needs.binary.outputs.version }}.tgz
601
+ run : rm -f ${{ github.workspace }}/stable/nginx-ingress-${{ needs.binary.outputs.helmChartVersion }}.tgz
601
602
- name : Retrieve latest Helm Chart
602
603
uses : actions/download-artifact@v2
603
604
with :
0 commit comments