Skip to content

Commit

Permalink
testing PR comment 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Greyeye committed May 1, 2024
1 parent 420ae79 commit 26b8051
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/git/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ func (rm *RepoManager) Clone(ctx context.Context, cloneUrl, branchName string) (
}

rm.lock.Lock()
defer rm.lock.Unlock() // just for safety's sake
//defer rm.lock.Unlock() // just for safety's sake
rm.repos = append(rm.repos, repo)

return repo, nil
}

func (rm *RepoManager) Cleanup() {
rm.lock.Lock()
defer rm.lock.Unlock()
//defer rm.lock.Unlock()

for _, repo := range rm.repos {
repo.Wipe()
Expand Down
7 changes: 3 additions & 4 deletions pkg/git/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/zapier/kubechecks/pkg"
"github.com/zapier/kubechecks/pkg/config"
"github.com/zapier/kubechecks/pkg/vcs"
"github.com/zapier/kubechecks/telemetry"
)

type Repo struct {
Expand Down Expand Up @@ -119,10 +118,10 @@ func (r *Repo) MergeIntoTarget(ctx context.Context, sha string) error {
defer span.End()

cmd := r.execCommand("git", "merge", sha)
out, err := cmd.CombinedOutput()
_, err := cmd.CombinedOutput()
if err != nil {
telemetry.SetError(span, err, "merge commit into branch")
log.Error().Err(err).Msgf("unable to merge %s, %s", sha, out)
//telemetry.SetError(span, err, "merge commit into branch")
//log.Error().Err(err).Msgf("unable to merge %s, %s", sha, out)
return err
}

Expand Down

0 comments on commit 26b8051

Please sign in to comment.