From f98ac210105fd0ed9eef16f2bbd5a5e2cdfc222d Mon Sep 17 00:00:00 2001 From: Henrik Jonsson Date: Thu, 3 Sep 2015 17:28:08 +0200 Subject: [PATCH] Fix build errors due to changes in github.com/gogits/go-gogs-client Change ParseHook -> ParsePushHook (https://github.com/gogits/go-gogs-client/blob/master/repo_hooks.go#L185), PayloadCommit.Id->ID (https://github.com/gogits/go-gogs-client/blob/master/repo_hooks.go#L88). Tested: `make deps` works after this change Fixes #1185 --- plugin/remote/gogs/gogs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/remote/gogs/gogs.go b/plugin/remote/gogs/gogs.go index 73038a4dc..23da4fcbe 100644 --- a/plugin/remote/gogs/gogs.go +++ b/plugin/remote/gogs/gogs.go @@ -164,7 +164,7 @@ func (r *Gogs) Deactivate(user *model.User, repo *model.Repo, link string) error func (r *Gogs) ParseHook(req *http.Request) (*model.Hook, error) { defer req.Body.Close() var payloadbytes, _ = ioutil.ReadAll(req.Body) - var payload, err = gogs.ParseHook(payloadbytes) + var payload, err = gogs.ParsePushHook(payloadbytes) if err != nil { return nil, err } @@ -181,7 +181,7 @@ func (r *Gogs) ParseHook(req *http.Request) (*model.Hook, error) { return &model.Hook{ Owner: payload.Repo.Owner.UserName, Repo: payload.Repo.Name, - Sha: payload.Commits[0].Id, + Sha: payload.Commits[0].ID, Branch: payload.Branch(), Author: payload.Commits[0].Author.UserName, Timestamp: time.Now().UTC().String(),