Merge branch 'main' into refactor/nested-api/user

go-vela · Apr 12, 2024 · 40acf3c · 40acf3c
2 parents e91a19c + fe803f8
commit 40acf3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/api/build/compile_publish.go b/api/build/compile_publish.go
@@ -426,6 +426,8 @@ func CompileAndPublish(
 		// error out the build
 		CleanBuild(c, database, b, nil, nil, retErr)
 
+		util.HandleError(c, http.StatusBadRequest, retErr)
+
 		return nil, nil, retErr
 	}
 

diff --git a/api/webhook/post.go b/api/webhook/post.go
@@ -309,6 +309,11 @@ func PostWebhook(c *gin.Context) {
 		queue.FromContext(c),
 	)
 
+	// error handling done in CompileAndPublish
+	if err != nil {
+		return
+	}
+
 	// capture the build and repo from the items
 	b, repo = item.Build, item.Repo