From 2d665dc591eb498a246cf6312f3bcffa2172420d Mon Sep 17 00:00:00 2001 From: "daniel.fonseca" Date: Fri, 20 Sep 2019 10:40:59 -0300 Subject: [PATCH 1/3] Fix assets key on release webhook --- services/release/release.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/release/release.go b/services/release/release.go index 4451633798c08..18a3f0d168a8e 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -109,12 +109,12 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea return err } + err = models.AddReleaseAttachments(rel.ID, attachmentUUIDs) + if err = rel.LoadAttributes(); err != nil { return err } - err = models.AddReleaseAttachments(rel.ID, attachmentUUIDs) - // even if attachments added failed, hooks will be still triggered mode, _ := models.AccessLevel(doer, rel.Repo) if err1 := models.PrepareWebhooks(rel.Repo, models.HookEventRelease, &api.ReleasePayload{ From f50cb06cb1b75259a750f3e6a14af989580877a5 Mon Sep 17 00:00:00 2001 From: "daniel.fonseca" Date: Fri, 20 Sep 2019 16:35:37 -0300 Subject: [PATCH 2/3] Fix assets key on release webhook --- services/release/release.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/release/release.go b/services/release/release.go index 18a3f0d168a8e..a71c85e762abb 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -109,7 +109,7 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea return err } - err = models.AddReleaseAttachments(rel.ID, attachmentUUIDs) + _ = models.AddReleaseAttachments(rel.ID, attachmentUUIDs) if err = rel.LoadAttributes(); err != nil { return err From 028cf5fe54fcb93d0e9c0cfc02dc8ced566006f3 Mon Sep 17 00:00:00 2001 From: "daniel.fonseca" Date: Mon, 23 Sep 2019 11:40:32 -0300 Subject: [PATCH 3/3] Add message to log on AddReleaseAttachments failure --- services/release/release.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/release/release.go b/services/release/release.go index a71c85e762abb..246a784efe65a 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -109,7 +109,9 @@ func UpdateRelease(doer *models.User, gitRepo *git.Repository, rel *models.Relea return err } - _ = models.AddReleaseAttachments(rel.ID, attachmentUUIDs) + if err = models.AddReleaseAttachments(rel.ID, attachmentUUIDs); err != nil { + log.Error("AddReleaseAttachments: %v", err) + } if err = rel.LoadAttributes(); err != nil { return err