File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -57,18 +57,19 @@ jobs:
5757 run : |
5858 set -euo pipefail
5959
60- RELEASE_VERSION ="${{ needs.export-registry.outputs.version }}"
61-
60+ RELEASE_TAG ="${{ needs.export-registry.outputs.tag }}"
61+ CHART_VERSION="${{ needs.export-registry.outputs.version }}"
6262 OCI_REGISTRY="${{ needs.export-registry.outputs.registry }}/charts"
63- make helm-push REGISTRY="${OCI_REGISTRY}" TAG="${RELEASE_VERSION}"
63+
64+ make helm-push REGISTRY="${OCI_REGISTRY}" TAG="${RELEASE_TAG}" CHART_VERSION="${CHART_VERSION}"
6465
6566 - name : Verify chart appVersion matches release tag
6667 run : |
6768 set -euo pipefail
6869
69- RELEASE_VERSION ="${{ needs.export-registry.outputs.version }}"
70- CHART_VERSION="${RELEASE_VERSION }"
71- EXPECTED_APP_VERSION="${RELEASE_VERSION }"
70+ RELEASE_TAG ="${{ needs.export-registry.outputs.tag }}"
71+ CHART_VERSION="${{ needs.export-registry.outputs.version } }"
72+ EXPECTED_APP_VERSION="${RELEASE_TAG }"
7273
7374 rm -rf .helm-verify
7475 mkdir -p .helm-verify
Original file line number Diff line number Diff line change @@ -235,10 +235,10 @@ push: ## Build and push all Docker images
235235
236236.PHONY : helm-push
237237helm-push : # # Package and push Helm charts to OCI registry
238- helm package charts/hub-agent --version $(TAG ) --app-version $(TAG ) --destination .helm-packages
239- helm package charts/member-agent --version $(TAG ) --app-version $(TAG ) --destination .helm-packages
240- helm push .helm-packages/hub-agent-$(TAG ) .tgz oci://$(REGISTRY )
241- helm push .helm-packages/member-agent-$(TAG ) .tgz oci://$(REGISTRY )
238+ helm package charts/hub-agent --version $(CHART_VERSION ) --app-version $(TAG ) --destination .helm-packages
239+ helm package charts/member-agent --version $(CHART_VERSION ) --app-version $(TAG ) --destination .helm-packages
240+ helm push .helm-packages/hub-agent-$(CHART_VERSION ) .tgz oci://$(REGISTRY )
241+ helm push .helm-packages/member-agent-$(CHART_VERSION ) .tgz oci://$(REGISTRY )
242242 rm -rf .helm-packages
243243
244244# By default, docker buildx create will pull image moby/buildkit:buildx-stable-1 and hit the too many requests error
Original file line number Diff line number Diff line change @@ -21,4 +21,4 @@ version: 0.1.0
2121# incremented each time you make changes to the application. Versions are not expected to
2222# follow Semantic Versioning. They should reflect the version the application is using.
2323# It is recommended to use it with quotes.
24- appVersion : " 0 .1.0"
24+ appVersion : " v0 .1.0"
You can’t perform that action at this time.
0 commit comments