diff --git a/README.md b/README.md index 64d27e2..ec26471 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ A GitHub action to turn a GitHub project into a self-hosted Helm chart repo, usi - `skip_existing`: Skip package upload if release/tag already exists - `mark_as_latest`: When you set this to `false`, it will mark the created GitHub release not as 'latest'. - `packages_with_index`: When you set this to `true`, it will upload chart packages directly into publishing branch. +- `pages_branch`: The GitHub pages branch ### Outputs diff --git a/action.yml b/action.yml index 7627f48..a08594b 100644 --- a/action.yml +++ b/action.yml @@ -35,6 +35,9 @@ inputs: packages_with_index: description: "Upload chart packages directly into publishing branch" required: false + pages_branch: + description: "The GitHub pages branch" + required: false outputs: changed_charts: description: "A comma-separated list of charts that were released on this run. Will be an empty string if no updates were detected, will be unset if `--skip_packaging` is used: in the latter case your custom packaging step is responsible for setting its own outputs if you need them." @@ -89,6 +92,9 @@ runs: if [[ -n "${{ inputs.packages_with_index }}" ]]; then args+=(--packages-with-index "${{ inputs.packages_with_index }}") + + if [[ -n "${{ inputs.pages_branch }}" ]]; then + args+=(--pages-branch "${{ inputs.pages_branch }}") fi "$GITHUB_ACTION_PATH/cr.sh" "${args[@]}" diff --git a/cr.sh b/cr.sh index 48804a9..f19caf0 100755 --- a/cr.sh +++ b/cr.sh @@ -30,6 +30,7 @@ Usage: $(basename "$0") -d, --charts-dir The charts directory (default: charts) -o, --owner The repo owner -r, --repo The repo name + --pages-branch The repo pages branch -n, --install-dir The Path to install the cr tool -i, --install-only Just install the cr tool -s, --skip-packaging Skip the packaging step (run your own packaging before using the releaser) @@ -50,6 +51,7 @@ main() { local skip_existing= local mark_as_latest=true local packages_with_index=false + local pages_branch= parse_command_line "$@" @@ -165,6 +167,12 @@ parse_command_line() { exit 1 fi ;; + --pages-branch) + if [[ -n "${2:-}" ]]; then + pages_branch="$2" + shift + fi + ;; -n | --install-dir) if [[ -n "${2:-}" ]]; then install_dir="$2" @@ -310,6 +318,9 @@ release_charts() { if [[ "$mark_as_latest" = false ]]; then args+=(--make-release-latest=false) fi + if [[ -n "$pages_branch" ]]; then + args+=(--pages-branch "$pages_branch") + fi echo 'Releasing charts...' cr upload "${args[@]}" @@ -323,6 +334,9 @@ update_index() { if [[ -n "$packages_with_index" ]]; then args+=(--packages-with-index --index-path .) fi + if [[ -n "$pages_branch" ]]; then + args+=(--pages-branch "$pages_branch") + fi echo 'Updating charts repo index...' cr index "${args[@]}"