From db9ffbd27065f9bb05b03c9444d588844444b127 Mon Sep 17 00:00:00 2001
From: Wojcik Michal <m.mwojcik@outlook.com>
Date: Sat, 26 Dec 2020 19:41:08 +0100
Subject: [PATCH] issue-19: add ability to define version and app-version of
 created helm package

---
 README.md         | 21 +++++++++++++++++++++
 action.yml        |  8 ++++++++
 src/entrypoint.sh |  7 ++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 400306a..e598b29 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ Inputs:
 * `linting` Toggle Helm linting, can be disabled by setting it to `off`
 * `commit_username` Explicitly specify username for commit back, default to `GITHUB_ACTOR`
 * `commit_email` Explicitly specify email for commit back, default to `GITHUB_ACTOR@users.noreply.github.com`
+* `app_version` Explicitly specify app version in package. If not defined then used chart values.
+* `chart_version` Explicitly specify chart version in package. If not defined then used chart values.
 
 ## Examples
 
@@ -64,3 +66,22 @@ jobs:
           commit_username: johndoe
           commit_email: johndoe@example.com
 ```
+Package chart with specified chart & app versions and push all charts in `./charts` dir to `gh-pages` branch:
+```yaml
+name: release
+on:
+  push:
+    tags: '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Publish Helm charts
+        uses: stefanprodan/helm-gh-pages@master
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          app_version: 1.16.0
+          chart_version: 0.1.0
+```
diff --git a/action.yml b/action.yml
index 002ea9e..1d79a25 100644
--- a/action.yml
+++ b/action.yml
@@ -40,6 +40,12 @@ inputs:
     description: "The email used for the commit user"
     required: false
     default: ${{ github.actor }}@users.noreply.github.com
+  app_version:
+    description: "Set the appVersion on the chart to this version"
+    required: false
+  chart_version:
+    description: "Set the version on the chart to this version"
+    required: false
 runs:
   using: 'docker'
   image: 'Dockerfile'
@@ -55,3 +61,5 @@ runs:
     - ${{ inputs.linting }}
     - ${{ inputs.commit_username }}
     - ${{ inputs.commit_email }}
+    - ${{ inputs.app_version }}
+    - ${{ inputs.chart_version }}
diff --git a/src/entrypoint.sh b/src/entrypoint.sh
index 7e72905..9a8b62e 100644
--- a/src/entrypoint.sh
+++ b/src/entrypoint.sh
@@ -28,6 +28,8 @@ HELM_VERSION=$8
 LINTING=$9
 COMMIT_USERNAME=${10}
 COMMIT_EMAIL=${11}
+APP_VERSION=${12}
+CHART_VERSION=${13}
 
 CHARTS=()
 CHARTS_TMP_DIR=$(mktemp -d)
@@ -123,7 +125,10 @@ lint() {
 }
 
 package() {
-  helm package ${CHARTS[*]} --destination ${CHARTS_TMP_DIR}
+  [[ -z $APP_VERSION ]] || APP_VERSION_CMD=" --app-version $APP_VERSION";
+  [[ -z $CHART_VERSION ]] || CHART_VERSION_CMD=" --version $CHART_VERSION"
+
+  helm package ${CHARTS[*]} --destination ${CHARTS_TMP_DIR} "$APP_VERSION_CMD" "$CHART_VERSION_CMD"
 }
 
 upload() {