diff --git a/.gitea/scripts/gitea-merge-queue.py b/.gitea/scripts/gitea-merge-queue.py index 17c3d318e..9fdaff375 100644 --- a/.gitea/scripts/gitea-merge-queue.py +++ b/.gitea/scripts/gitea-merge-queue.py @@ -44,7 +44,10 @@ REQUIRED_CONTEXTS_RAW = _env( "REQUIRED_CONTEXTS", default=( "CI / all-required (pull_request)," - "sop-checklist / all-items-acked (pull_request)" + "sop-checklist / all-items-acked (pull_request)," + "sop-tier-check / tier-check (pull_request_review)," + "qa-review / approved (pull_request_target)," + "security-review / approved (pull_request_target)" ), ) # Required contexts for push (main/staging) runs. The push CI uses the same diff --git a/.gitea/workflows/audit-force-merge.yml b/.gitea/workflows/audit-force-merge.yml index 00c47312f..87925f781 100644 --- a/.gitea/workflows/audit-force-merge.yml +++ b/.gitea/workflows/audit-force-merge.yml @@ -61,11 +61,18 @@ jobs: "main": [ "CI / all-required (pull_request)", "E2E API Smoke Test / E2E API Smoke Test (pull_request)", - "Handlers Postgres Integration / Handlers Postgres Integration (pull_request)" + "Handlers Postgres Integration / Handlers Postgres Integration (pull_request)", + "sop-checklist / all-items-acked (pull_request)", + "sop-tier-check / tier-check (pull_request_review)", + "qa-review / approved (pull_request_target)", + "security-review / approved (pull_request_target)" ], "staging": [ "CI / all-required (pull_request)", - "sop-checklist / all-items-acked (pull_request)" + "sop-checklist / all-items-acked (pull_request)", + "sop-tier-check / tier-check (pull_request_review)", + "qa-review / approved (pull_request_target)", + "security-review / approved (pull_request_target)" ] } run: bash .gitea/scripts/audit-force-merge.sh