helm / chart-releaser

Hosting Helm Charts via GitHub Pages and Releases
Apache License 2.0
684 stars 113 forks source link

rebase issue on gh-pages with cr > 1.4 #379

Open EugenMayer opened 9 months ago

EugenMayer commented 9 months ago

After upgrading from 1.4 to 1.6.1 i know get a rebase issue when pushing the index. I do not have any un pushed changes.

I went so far removing the repo locally and cloning it from scarch and trying to release the charts to the index, but it happened again

Using config file:  /home/em/Development/projects/k8s/helm-external/cr.yaml
Loading index file from git repository index.yaml
Preparing worktree (detached HEAD a42c103)
HEAD is now at a42c103 add git ignore
Found cert-manager-cloudflare-config-1.1.0.tgz
Found coredns-private-dns-fix-0.1.1.tgz
Found iperf3-0.2.0.tgz
Found iperf3-0.2.1.tgz
Found localpath-1.1.0.tgz
Found longhorn-backup-config-0.0.1.tgz
Found nist-data-mirror-0.1.2.tgz
Found openldap-test-0.0.5.tgz
Found postgres-pgdump-backup-0.4.0.tgz
Found postgres-pgdump-backup-0.4.6.tgz
Found postgres-pgdump-backup-0.5.2.tgz
Found rundeck-0.9.5.tgz
Found rundeck-0.9.6.tgz
Found rundeck-1.11.0.tgz
Extracting chart metadata from .deploy/rundeck-1.11.0.tgz
Calculating Hash for .deploy/rundeck-1.11.0.tgz
Found rundeck-1.7.0.tgz
Found rundeck-1.8.0.tgz
Found vulnz-nvd-mirror-0.0.4.tgz
Found vulnz-nvd-mirror-0.1.1.tgz
Extracting chart metadata from .deploy/vulnz-nvd-mirror-0.1.1.tgz
Calculating Hash for .deploy/vulnz-nvd-mirror-0.1.1.tgz
Found whatsmyip-1.0.4.tgz
Updating index index.yaml
error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them.
Error: exit status 128

Do i miss something?

EugenMayer commented 8 months ago

AFAICS the problem is, that global gitignore definitions are ignored by the cr, means if there is something in the repo, that is ignored by ~/.gitignore but not by the .gitignore file in the repo itself, one gets the above rebase issue with unstaged changes.

We should at least state this in cr - using ~/.gitignore is not uncommon

Kerwood commented 4 months ago

I'm have the same issue with v1.6.1. I have no idea why.

Loading index file from git repository .cr-index/index.yaml
Preparing worktree (detached HEAD 61f39d8)
HEAD is now at 61f39d8 updated .gitignore
Found azure-group-controller-1.0.0.tgz
Extracting chart metadata from .cr-release-packages/azure-group-controller-1.0.0.tgz
Calculating Hash for .cr-release-packages/azure-group-controller-1.0.0.tgz
Updating index .cr-index/index.yaml
error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them.
Error: exit status 128