From b4a25c54e454aad282a84df2f44bc9809c1848cf Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Wed, 12 Feb 2020 11:40:49 +0100 Subject: [PATCH] [IMP] runbot: better same branch build filter --- runbot/models/branch.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runbot/models/branch.py b/runbot/models/branch.py index fae2e192..d4aff4c0 100644 --- a/runbot/models/branch.py +++ b/runbot/models/branch.py @@ -174,11 +174,16 @@ class runbot_branch(models.Model): query = """ SELECT max(b.id) FROM runbot_build b + JOIN runbot_branch br ON br.id = b.branch_id + WHERE b.branch_id IN ( SELECT id from runbot_branch WHERE %s ) AND b.build_type IN ('normal', 'rebuild') AND b.repo_id in %%s + AND (b.hidden = false OR b.hidden IS NULL) + AND b.parent_id IS NULL + AND (br.no_build = false OR br.no_build IS NULL) GROUP BY b.repo_id """ % where_clause