diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml index 00a0705..ef7008a 100644 --- a/charts/spire/Chart.yaml +++ b/charts/spire/Chart.yaml @@ -3,7 +3,7 @@ name: spire description: > A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager. type: application -version: 0.3.0 +version: 0.4.0 appVersion: "1.5.5" keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"] home: https://github.com/spiffe/helm-charts/tree/main/charts/spire diff --git a/charts/spire/README.md b/charts/spire/README.md index b99a99c..78d0d1d 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -2,7 +2,7 @@ -![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.5](https://img.shields.io/badge/AppVersion-1.5.5-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.5](https://img.shields.io/badge/AppVersion-1.5.5-informational?style=flat-square) A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager. diff --git a/release-chart.sh b/release-chart.sh index 99fbf7e..6b3f273 100755 --- a/release-chart.sh +++ b/release-chart.sh @@ -100,9 +100,11 @@ if [ ! -f "charts/${chart}/Chart.yaml" ] ; then print_error_and_exit "no chart named '${chart}' in charts folder" fi +branch_name="bump-${chart}-version" + git checkout main git pull -git checkout --track -B "bump-${chart}-version" main +git checkout --track -B "${branch_name}" main commits_since_previous_release="$(git log "${chart}-${current_version}..HEAD" --pretty=format:'* %h %s')" "${SED}" -i "s/version: ${current_version}/version: ${new_version}/" "charts/${chart}/Chart.yaml" ./helm-docs.sh @@ -131,5 +133,19 @@ Please review the below changelog to ensure this matches up with the semantic ve ${commits_since_previous_release} EOF +if [ -n "${dry_run}" ] ; then + echo >&2 + echo >&2 "If you choose not to submit the PR please run following commands to cleanup the branch:" + echo >&2 + echo >&2 " git checkout main" + echo >&2 " git push origin :${branch_name}" + echo >&2 " git branch -D ${branch_name}" + echo >&2 + echo >&2 'If you choose to submit the PR, please run following:' + echo >&2 + echo >&2 " gh pr merge --auto -r -d" + exit +fi + gh pr merge --auto -r -d git checkout main