Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/deployment/gitOps/git/GitOpsHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func (impl *GitOpsHelper) Clone(url, targetDir string) (clonedDir string, err er
}
}
if errMsg != "" {
impl.logger.Errorw("error in git fetch command", "errMsg", errMsg, "err", err)
return "", fmt.Errorf(errMsg)
}
return clonedDir, nil
Expand Down
1 change: 1 addition & 0 deletions pkg/deployment/gitOps/git/GitServiceGithub.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ func (impl GitHubClient) GetRepoUrl(config *bean2.GitOpsConfigDto) (repoUrl stri
ctx := context.Background()
repo, _, err := impl.client.Repositories.Get(ctx, impl.org, config.GitRepoName)
if err != nil {
impl.logger.Errorw("error in getting repo url by repo name", "org", impl.org, "gitRepoName", config.GitRepoName, "err", err)
return "", err
}
return *repo.CloneURL, nil
Expand Down
3 changes: 3 additions & 0 deletions pkg/deployment/gitOps/git/commandManager/GitCliManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ func (impl *GitCliManagerImpl) Pull(ctx GitContext, repoRoot string) (err error)
return err
}
response, errMsg, err := impl.PullCli(ctx, repoRoot, "origin/master")
if err != nil {
impl.logger.Errorw("error in git pull from cli", "errMsg", errMsg, "err", err)
}

if strings.Contains(response, "already up-to-date") || strings.Contains(errMsg, "already up-to-date") {
err = nil
Expand Down
3 changes: 3 additions & 0 deletions pkg/deployment/gitOps/git/commandManager/GoGitSdkManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ func (impl GoGitSDKManagerImpl) Pull(ctx GitContext, repoRoot string) (err error
}

err = workTree.PullContext(ctx, pullOptions)
if err != nil {
impl.logger.Errorw("error in git pull from go-git", "err", err)
}
if err != nil && err.Error() == "already up-to-date" {
err = nil
return nil
Expand Down
3 changes: 3 additions & 0 deletions scripts/sql/276_alter_pipeline_stage_step_variable.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE pipeline_stage_step_variable ALTER COLUMN default_value TYPE VARCHAR(255);
ALTER TABLE pipeline_stage_step_variable ALTER COLUMN value TYPE VARCHAR(255);

2 changes: 2 additions & 0 deletions scripts/sql/276_alter_pipeline_stage_step_variable.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE pipeline_stage_step_variable ALTER COLUMN value TYPE text;
ALTER TABLE pipeline_stage_step_variable ALTER COLUMN default_value TYPE text;