Merge pull request #27 from clenimar/master

add INDEX_DIR argument

Author: stefanprodan

README.md

@@ -18,6 +18,7 @@ Inputs:
 * `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.
+* `index_dir` The location of `index.yaml` file in the repo, defaults to the same value as `target_dir`
 
 ## Examples
 

action.yml

@@ -46,6 +46,9 @@ inputs:
   chart_version:
     description: "Set the version on the chart to this version"
     required: false
+  index_dir:
+    description: "The location of `index.yaml` file in the repo, defaults to the same value as `target_dir`"
+    required: false
 runs:
   using: 'docker'
   image: 'Dockerfile'
@@ -63,3 +66,4 @@ runs:
     - ${{ inputs.commit_email }}
     - ${{ inputs.app_version }}
     - ${{ inputs.chart_version }}
+    - ${{ inputs.index_dir }}

src/entrypoint.sh

@@ -30,6 +30,7 @@ COMMIT_USERNAME=${10}
 COMMIT_EMAIL=${11}
 APP_VERSION=${12}
 CHART_VERSION=${13}
+INDEX_DIR=${14}
 
 CHARTS=()
 CHARTS_TMP_DIR=$(mktemp -d)
@@ -81,6 +82,10 @@ main() {
       COMMIT_EMAIL="${GITHUB_ACTOR}@users.noreply.github.com"
   fi
 
+  if [[ -z "$INDEX_DIR" ]]; then
+      INDEX_DIR=${TARGET_DIR}
+  fi
+
   locate
   download
   dependencies
@@ -151,18 +156,20 @@ upload() {
 
   mkdir -p ${TARGET_DIR}
 
-  if [[ -f "${TARGET_DIR}/index.yaml" ]]; then
+  if [[ -f "${INDEX_DIR}/index.yaml" ]]; then
     echo "Found index, merging changes"
-    helm repo index ${CHARTS_TMP_DIR} --url ${CHARTS_URL} --merge "${TARGET_DIR}/index.yaml"
+    helm repo index ${CHARTS_TMP_DIR} --url ${CHARTS_URL} --merge "${INDEX_DIR}/index.yaml"
     mv -f ${CHARTS_TMP_DIR}/*.tgz ${TARGET_DIR}
-    mv -f ${CHARTS_TMP_DIR}/index.yaml ${TARGET_DIR}/index.yaml
+    mv -f ${CHARTS_TMP_DIR}/index.yaml ${INDEX_DIR}/index.yaml
   else
     echo "No index found, generating a new one"
     mv -f ${CHARTS_TMP_DIR}/*.tgz ${TARGET_DIR}
-    helm repo index ${TARGET_DIR} --url ${CHARTS_URL}
+    helm repo index ${INDEX_DIR} --url ${CHARTS_URL}
   fi
 
   git add ${TARGET_DIR}
+  git add ${INDEX_DIR}/index.yaml
+
   git commit -m "Publish $charts"
   git push origin ${BRANCH}