fix(github): fix push conflict with pr
@@ -401,7 +401,7 @@ class Trigger(object):
AND b.project_id = c.project_id
WHERE
c.pull_request_id = %s AND
- j.state in ('scheduled', 'running') AND
+ j.state in ('scheduled', 'running', 'queued') AND
c.id != %s
''', [pr_id, commit_id], fetch=False)
@@ -414,7 +414,7 @@ class Trigger(object):
ON b.id = j.build_id
WHERE
b.commit_id = %s AND
- j.state in ('scheduled', 'running')
+ j.state in ('scheduled', 'running', 'queued')
''', [commit_id], fetch=False)
if not self.has_active_build(commit_id, project_id):
