From 0a83f66890ba26b85930446109cd846d32c9a6c7 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2026 22:55:46 +0000 Subject: [PATCH] feat(warden): Wait for ready for review before running Warden Ruleset-required workflows only receive opened, synchronize, and reopened, so a passing run on a draft lets a PR marked ready merge unreviewed. Fail draft runs before any model call and check the live draft state, so a re-run after marking the PR ready proceeds. Turn on incremental review so re-runs and later pushes skip hunks a clean run already covered. Co-Authored-By: Jeffrey Hung --- .github/scripts/warden-require-ready.sh | 27 +++++++++++++++++++++++++ .github/workflows/warden.yml | 6 ++++++ warden.toml | 3 +++ 3 files changed, 36 insertions(+) create mode 100755 .github/scripts/warden-require-ready.sh diff --git a/.github/scripts/warden-require-ready.sh b/.github/scripts/warden-require-ready.sh new file mode 100755 index 0000000..44930b4 --- /dev/null +++ b/.github/scripts/warden-require-ready.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Fail Warden on draft pull requests. Ruleset workflows never receive +# ready_for_review, so a passing run on a draft would let a PR that is later +# marked ready merge without review. This reads the live draft state, not the +# event payload, so re-running the check after marking the PR ready passes. +set -eu + +: "${PR_URL:?PR_URL is required}" +: "${GITHUB_STEP_SUMMARY:?GITHUB_STEP_SUMMARY is required}" + +is_draft=$(gh pr view "$PR_URL" --json isDraft --jq .isDraft) + +case "$is_draft" in + false) + exit 0 + ;; + true) + message="Warden reviews this pull request once it is ready for review. Mark it ready, then re-run this check or push a commit." + printf '::error::%s\n' "$message" + printf '## Warden is waiting\n\n%s\n' "$message" >> "$GITHUB_STEP_SUMMARY" + exit 1 + ;; + *) + printf '::error::Unexpected isDraft value from gh: %s\n' "$is_draft" + exit 1 + ;; +esac diff --git a/.github/workflows/warden.yml b/.github/workflows/warden.yml index 8a7d3f1..47c830e 100644 --- a/.github/workflows/warden.yml +++ b/.github/workflows/warden.yml @@ -54,6 +54,12 @@ jobs: repository: ${{ github.repository_owner }}/.github path: .warden-org + - name: Require ready for review + env: + GH_TOKEN: ${{ github.token }} + PR_URL: ${{ github.event.pull_request.html_url }} + run: .warden-org/.github/scripts/warden-require-ready.sh + - name: Analyze id: warden-analyze uses: getsentry/warden@v0 diff --git a/warden.toml b/warden.toml index a8f8d30..763a4b0 100644 --- a/warden.toml +++ b/warden.toml @@ -31,6 +31,9 @@ ignorePaths = [ "**/migrations/meta/**", "**/*_snapshot.json", ] +# Skip hunks an earlier clean run on the PR already reviewed, so re-runs and +# pushes after a PR is marked ready do not pay for the same code twice. +incremental = true incrementalApp = "sentry-warden" [defaults.agent]