Merge pull request #8 from steven-sheehy/target-dir

Add support for storing charts in sub-folder

README.md

@@ -11,6 +11,7 @@ Inputs:
 * `owner` The GitHub user or org that owns this repository, defaults to the owner in `GITHUB_REPOSITORY` env var
 * `repository` The GitHub repository, defaults to the `GITHUB_REPOSITORY` env var
 * `branch` The branch to publish charts, defaults to `gh-pages`
+* `target_dir` The target directory to store the charts, defaults to `.`
 * `helm_version` The Helm CLI version, defaults to the latest release
 
 ## Examples
@@ -56,4 +57,5 @@ jobs:
           owner: fluxcd
           repository: charts
           branch: gh-pages
+          target_dir: charts
 ```

action.yml

@@ -23,6 +23,9 @@ inputs:
   branch:
     description: "The branch to publish charts, defaults to `gh-pages`"
     required: false
+  target_dir:
+    description: "The target directory to store the charts, defaults to `.`"
+    required: false
   helm_version:
     description: "The Helm CLI version"
     required: false
@@ -36,4 +39,5 @@ runs:
     - ${{ inputs.user }}
     - ${{ inputs.repository }}
     - ${{ inputs.branch }}
+    - ${{ inputs.target_dir }}
     - ${{ inputs.helm_version }}

src/entrypoint.sh

@@ -9,7 +9,8 @@ CHARTS_URL=$3
 OWNER=$4
 REPOSITORY=$5
 BRANCH=$6
-HELM_VERSION=$7
+TARGET_DIR=$7
+HELM_VERSION=$8
 
 CHARTS=()
 CHARTS_TMP_DIR=$(mktemp -d)
@@ -37,10 +38,18 @@ main() {
       BRANCH="gh-pages"
   fi
 
+  if [[ -z "$TARGET_DIR" ]]; then
+    TARGET_DIR="."
+  fi
+
   if [[ -z "$CHARTS_URL" ]]; then
       CHARTS_URL="https://${OWNER}.github.io/${REPOSITORY}"
   fi
 
+  if [[ "$TARGET_DIR" != "." ]]; then
+    CHARTS_URL="${CHARTS_URL}/${TARGET_DIR}"
+  fi
+
   if [[ -z "$REPO_URL" ]]; then
       REPO_URL="https://x-access-token:${GITHUB_TOKEN}@github.com/${OWNER}/${REPOSITORY}"
   fi
@@ -103,10 +112,11 @@ upload() {
 
   charts=$(cd ${CHARTS_TMP_DIR} && ls *.tgz | xargs)
 
-  mv -f ${CHARTS_TMP_DIR}/*.tgz .
-  helm repo index . --url ${CHARTS_URL}
+  mkdir -p ${TARGET_DIR}
+  mv -f ${CHARTS_TMP_DIR}/*.tgz ${TARGET_DIR}
+  helm repo index ${TARGET_DIR} --url ${CHARTS_URL}
 
-  git add .
+  git add ${TARGET_DIR}
   git commit -m "Publish $charts"
   git push origin gh-pages