From 82c534ad18920720141899b2153e4d07c92545bf Mon Sep 17 00:00:00 2001 From: brice Date: Fri, 6 May 2016 22:14:19 +0200 Subject: [PATCH 1/8] Suppression de EventBranch --- remote/gogs/gogs.go | 7 ++++++- remote/gogs/helper.go | 19 +++++++++++++++++-- remote/gogs/types.go | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/remote/gogs/gogs.go b/remote/gogs/gogs.go index db467964c..30981db77 100644 --- a/remote/gogs/gogs.go +++ b/remote/gogs/gogs.go @@ -166,7 +166,12 @@ func (c *client) Perm(u *model.User, owner, name string) (*model.Perm, error) { // File fetches the file from the Gogs repository and returns its contents. func (c *client) File(u *model.User, r *model.Repo, b *model.Build, f string) ([]byte, error) { client := c.newClientToken(u.Token) - cfg, err := client.GetFile(r.Owner, r.Name, b.Commit, f) + buildRef := b.Commit + if buildRef == "" { + buildRef = b.Ref + } + cfg, err := client.GetFile(r.Owner, r.Name, buildRef, f) + return cfg, err } diff --git a/remote/gogs/helper.go b/remote/gogs/helper.go index dd6f91ede..ba66419f1 100644 --- a/remote/gogs/helper.go +++ b/remote/gogs/helper.go @@ -70,13 +70,28 @@ func buildFromPush(hook *pushHook) *model.Build { hook.Repo.URL, fixMalformedAvatar(hook.Sender.Avatar), ) + + var eventType string + var message string + + switch { + case hook.RefType == "tag": + eventType = model.EventTag + message = "Tag " + hook.Ref + case hook.RefType == "branch": + eventType = "" + default: + eventType = model.EventPush + message = hook.Commits[0].Message + } + return &model.Build{ - Event: model.EventPush, + Event: eventType, Commit: hook.After, Ref: hook.Ref, Link: hook.Compare, Branch: strings.TrimPrefix(hook.Ref, "refs/heads/"), - Message: hook.Commits[0].Message, + Message: message, Avatar: avatar, Author: hook.Sender.Login, Timestamp: time.Now().UTC().Unix(), diff --git a/remote/gogs/types.go b/remote/gogs/types.go index 2b9f38ed1..a2de2a0e8 100644 --- a/remote/gogs/types.go +++ b/remote/gogs/types.go @@ -5,6 +5,7 @@ type pushHook struct { Before string `json:"before"` After string `json:"after"` Compare string `json:"compare_url"` + RefType string `json:"ref_type"` Pusher struct { Name string `json:"name"` From c8d1fe0468452fe7ecc7bbbe5285a27e2638c80d Mon Sep 17 00:00:00 2001 From: bsauvajon Date: Thu, 18 Feb 2016 09:07:35 +0100 Subject: [PATCH 2/8] Manage TAG and BRANCH events sent from gogs --- model/const.go | 1 + remote/gogs/gogs.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/model/const.go b/model/const.go index efac6b3bd..761ee0dbc 100644 --- a/model/const.go +++ b/model/const.go @@ -5,6 +5,7 @@ const ( EventPull = "pull_request" EventTag = "tag" EventDeploy = "deployment" + EventBranch = "branch" ) const ( diff --git a/remote/gogs/gogs.go b/remote/gogs/gogs.go index 30981db77..2e5bb95e0 100644 --- a/remote/gogs/gogs.go +++ b/remote/gogs/gogs.go @@ -171,7 +171,6 @@ func (c *client) File(u *model.User, r *model.Repo, b *model.Build, f string) ([ buildRef = b.Ref } cfg, err := client.GetFile(r.Owner, r.Name, buildRef, f) - return cfg, err } From 5642e9ab3bbd75b9731a6662539feb367bd33186 Mon Sep 17 00:00:00 2001 From: brice Date: Fri, 6 May 2016 22:04:56 +0200 Subject: [PATCH 3/8] Suppression de EventBranch --- model/const.go | 1 - 1 file changed, 1 deletion(-) diff --git a/model/const.go b/model/const.go index 761ee0dbc..efac6b3bd 100644 --- a/model/const.go +++ b/model/const.go @@ -5,7 +5,6 @@ const ( EventPull = "pull_request" EventTag = "tag" EventDeploy = "deployment" - EventBranch = "branch" ) const ( From 744cf55bf567661f5cd940d49535f516e2ec3df5 Mon Sep 17 00:00:00 2001 From: brice Date: Wed, 7 Sep 2016 08:46:42 +0200 Subject: [PATCH 4/8] change eventType for tag events from gogs --- remote/gogs/gogs.go | 2 +- remote/gogs/helper.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/remote/gogs/gogs.go b/remote/gogs/gogs.go index 2e5bb95e0..4ff607068 100644 --- a/remote/gogs/gogs.go +++ b/remote/gogs/gogs.go @@ -234,7 +234,7 @@ func (c *client) Hook(r *http.Request) (*model.Repo, *model.Build, error) { case "push": var push *pushHook push, err = parsePush(r.Body) - if err == nil { + if err == nil && push.RefType != "branch" { repo = repoFromPush(push) build = buildFromPush(push) } diff --git a/remote/gogs/helper.go b/remote/gogs/helper.go index ba66419f1..eb75937fe 100644 --- a/remote/gogs/helper.go +++ b/remote/gogs/helper.go @@ -78,8 +78,6 @@ func buildFromPush(hook *pushHook) *model.Build { case hook.RefType == "tag": eventType = model.EventTag message = "Tag " + hook.Ref - case hook.RefType == "branch": - eventType = "" default: eventType = model.EventPush message = hook.Commits[0].Message From a24bcf22259bc2cab20b017d286e704a7a582571 Mon Sep 17 00:00:00 2001 From: bsauvajon Date: Thu, 18 Feb 2016 09:07:35 +0100 Subject: [PATCH 5/8] Manage TAG and BRANCH events sent from gogs --- model/const.go | 1 + 1 file changed, 1 insertion(+) diff --git a/model/const.go b/model/const.go index efac6b3bd..761ee0dbc 100644 --- a/model/const.go +++ b/model/const.go @@ -5,6 +5,7 @@ const ( EventPull = "pull_request" EventTag = "tag" EventDeploy = "deployment" + EventBranch = "branch" ) const ( From 549f600748ce646b3a940023255aee425be5ba08 Mon Sep 17 00:00:00 2001 From: brice Date: Fri, 6 May 2016 22:04:56 +0200 Subject: [PATCH 6/8] Suppression de EventBranch --- model/const.go | 1 - 1 file changed, 1 deletion(-) diff --git a/model/const.go b/model/const.go index 761ee0dbc..efac6b3bd 100644 --- a/model/const.go +++ b/model/const.go @@ -5,7 +5,6 @@ const ( EventPull = "pull_request" EventTag = "tag" EventDeploy = "deployment" - EventBranch = "branch" ) const ( From c60f4f5c4be6769f1cdbf05712d295bc9238ccdb Mon Sep 17 00:00:00 2001 From: bsauvajon Date: Thu, 18 Feb 2016 09:07:35 +0100 Subject: [PATCH 7/8] Manage TAG and BRANCH events sent from gogs --- model/const.go | 1 + 1 file changed, 1 insertion(+) diff --git a/model/const.go b/model/const.go index efac6b3bd..761ee0dbc 100644 --- a/model/const.go +++ b/model/const.go @@ -5,6 +5,7 @@ const ( EventPull = "pull_request" EventTag = "tag" EventDeploy = "deployment" + EventBranch = "branch" ) const ( From 37f89e924a0f090654ccc718857fa5eedf83e29d Mon Sep 17 00:00:00 2001 From: brice Date: Fri, 6 May 2016 22:04:56 +0200 Subject: [PATCH 8/8] Suppression de EventBranch --- model/const.go | 1 - 1 file changed, 1 deletion(-) diff --git a/model/const.go b/model/const.go index 761ee0dbc..efac6b3bd 100644 --- a/model/const.go +++ b/model/const.go @@ -5,7 +5,6 @@ const ( EventPull = "pull_request" EventTag = "tag" EventDeploy = "deployment" - EventBranch = "branch" ) const (