Merge branch 'dk/prebuilds' of github.com:/coder/coder into dk/prebuilds-tests

This commit is contained in:
Danny Kopping
2025-03-03 12:46:44 +00:00
7 changed files with 178 additions and 143 deletions

View File

@ -5624,7 +5624,7 @@ FROM workspace_prebuilds p
ON tvp_curr.id = p.current_preset_id -- See https://github.com/coder/internal/issues/398.
WHERE (b.transition = 'start'::workspace_transition
-- Jobs that are not in terminal states.
OR pj.job_status IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status,
AND pj.job_status NOT IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status,
'unknown'::provisioner_job_status))
`

View File

@ -18,7 +18,7 @@ FROM workspace_prebuilds p
ON tvp_curr.id = p.current_preset_id -- See https://github.com/coder/internal/issues/398.
WHERE (b.transition = 'start'::workspace_transition
-- Jobs that are not in terminal states.
OR pj.job_status IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status,
AND pj.job_status NOT IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status,
'unknown'::provisioner_job_status));
-- name: GetTemplatePresetsWithPrebuilds :many