Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support update svn hooks #611

Merged
merged 2 commits into from
Nov 20, 2018

Conversation

zhujian7
Copy link
Collaborator

  • fix can not update svn hooks
  • get svn repo info by main repo url instead of svn server url

What this PR does / why we need it:

Add your description

Which issue(s) this PR is related to (optional, link to 3rd issue(s)):

Fixes #

Reference to #

Special notes for your reviewer:

/cc @your-reviewer

Release note:

NONE

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 20, 2018
- fix can not update svn hooks
- get svn repo info by main repo url instead of svn server url
@zhujian7
Copy link
Collaborator Author

/cc @supereagle @cd1989

gitSource, err = api.GetGitSource(pipeline.Build.Stages.CodeCheckout.MainRepo)
if err != nil {
return nil, err
createWebhook(pipeline, provider, scmConfig.Type, gitSource.Url, "")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the returned error by createWebhook()?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

// Remove the webhook if there is error.
defer func() {
if err != nil && gitSource != nil && pipeline.AutoTrigger != nil && pipeline.AutoTrigger.SCMTrigger != nil {
//if err != nil && gitSource != nil && webHook != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have fixed

@supereagle
Copy link
Member

/lgtm

@caicloud-bot caicloud-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2018
@caicloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: supereagle

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@caicloud-bot caicloud-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 20, 2018
@caicloud-bot caicloud-bot merged commit 315acbf into caicloud:release-0.7 Nov 20, 2018
@zhujian7
Copy link
Collaborator Author

/cherrypick master

@caicloud-bot
Copy link
Collaborator

@zhujian7: #611 failed to apply on top of branch "master":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/scm/provider/github/github.go
M	pkg/scm/provider/gitlab/gitlabv3.go
M	pkg/scm/provider/gitlab/gitlabv4.go
M	pkg/scm/provider/svn/svn.go
M	pkg/scm/scm.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/scm/scm.go
CONFLICT (content): Merge conflict in pkg/scm/scm.go
Auto-merging pkg/scm/provider/svn/svn.go
Auto-merging pkg/scm/provider/gitlab/gitlabv4.go
CONFLICT (content): Merge conflict in pkg/scm/provider/gitlab/gitlabv4.go
Auto-merging pkg/scm/provider/gitlab/gitlabv3.go
CONFLICT (content): Merge conflict in pkg/scm/provider/gitlab/gitlabv3.go
Auto-merging pkg/scm/provider/github/github.go
CONFLICT (content): Merge conflict in pkg/scm/provider/github/github.go
Patch failed at 0001 fix: support update svn hooks

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants