Skip to content

Commit 5398fb7

Browse files
authored
fix: don't setup worktree if not packaging for git (#486)
Signed-off-by: Chris Wiggins <[email protected]>
1 parent 178002f commit 5398fb7

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

pkg/releaser/releaser.go

+8-4
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,15 @@ func (r *Releaser) addToIndexFile(indexFile *repo.IndexFile, url string) error {
289289

290290
// CreateReleases finds and uploads Helm chart packages to GitHub
291291
func (r *Releaser) CreateReleases() error {
292-
worktree, err := r.git.AddWorktree("", r.config.Remote+"/"+r.config.PagesBranch)
293-
if err != nil {
294-
return err
292+
worktree := ""
293+
if r.config.PackagesWithIndex {
294+
worktree, err := r.git.AddWorktree("", r.config.Remote+"/"+r.config.PagesBranch)
295+
if err != nil {
296+
return err
297+
}
298+
299+
defer r.git.RemoveWorktree("", worktree) // nolint: errcheck
295300
}
296-
defer r.git.RemoveWorktree("", worktree) // nolint: errcheck
297301

298302
packages, err := r.getListOfPackages(r.config.PackagePath)
299303
if err != nil {

pkg/releaser/releaser_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,13 @@ func TestReleaser_CreateReleases(t *testing.T) {
467467
assert.Equal(t, tt.commit, fakeGitHub.release.Commit)
468468
assert.Equal(t, tt.latest, fakeGitHub.release.MakeLatest)
469469
assert.Equal(t, tt.Releaser.config.Commit, fakeGitHub.release.Commit)
470+
if !tt.Releaser.config.PackagesWithIndex {
471+
fakeGit.AssertNumberOfCalls(t, "AddWorktree", 0)
472+
fakeGit.AssertNumberOfCalls(t, "RemoveWorktree", 0)
473+
fakeGit.AssertNumberOfCalls(t, "Add", 0)
474+
fakeGit.AssertNumberOfCalls(t, "Commit", 0)
475+
fakeGit.AssertNumberOfCalls(t, "Push", 0)
476+
}
470477
fakeGitHub.AssertNumberOfCalls(t, "CreateRelease", 1)
471478
}
472479
})

0 commit comments

Comments
 (0)