Skip to content

ci: dual-gate merge policy (static + ThrillhouseBot) (#342)#391

Merged
devops-thiago merged 2 commits into
release/v0.5.0from
ci/issue-342-dual-gate-merge-policy
Jul 17, 2026
Merged

ci: dual-gate merge policy (static + ThrillhouseBot) (#342)#391
devops-thiago merged 2 commits into
release/v0.5.0from
ci/issue-342-dual-gate-merge-policy

Conversation

@devops-thiago

@devops-thiago devops-thiago commented Jul 15, 2026

Copy link
Copy Markdown
Owner

What type of PR is this?

  • 🐛 Bug fix
  • ✨ Feature
  • 📝 Documentation
  • 🔧 Refactor
  • 🚀 Performance
  • ✅ Test
  • 🔒 Security
  • 📦 Dependency update
  • 🏗️ CI/CD

Description

Closes the v0.3.1 dual-gate gap from #342: ThrillhouseBot's LLM review and static dependency CI are complementary, not substitutes.

Changes

  • CONTRIBUTING.md — documents the dual-gate merge policy, optional Bugbot as a non-required third signal, and maintainer triage when the gates disagree (including the Jackson GHSA hold pattern from fix(security): document/suppress non-applicable jackson GHSA-5jmj-h7xm-6q6v (no 2.x fix) #308).
  • dependency-review.yml — runs on main / develop / release/** (aligned with CI), with comments tying the job to the dual-gate policy.
  • Repo ruleset (already applied)dependency-review added to required status checks on main-protection alongside format, test, frontend, trivy.

Does not duplicate ThrillhouseBot's LLM pass or implement linters-in-prompt (#34).

Related Issues

Fixes #342

Related: #34 (linters in LLM context — separate), #308 (Jackson GHSA hold pattern), #113, #318

How Has This Been Tested?

  • Unit tests

  • Integration tests

  • Manual testing

  • Confirmed main-protection ruleset now requires dependency-review.

  • Reviewed workflow YAML against existing SHA-pinned action versions.

  • Docs-only / workflow-metadata change — no Java/frontend unit tests required.

  • CI on this PR: dependency-review, format, test, frontend, trivy, Sonar, CodeQL, Codecov all green.

Checklist

  • My code follows the project's coding standards
  • I have performed a self-review of my own code
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have updated the documentation accordingly
  • My changes generate no new warnings or errors

Screenshots / Logs

N/A — docs + workflow metadata only. Dependency Review summary on this PR: no vulnerabilities or license issues found.

Additional Notes

  • ThrillhouseBot remains a soft gate (check can be NEUTRAL/skipped); static dependency-review is now merge-blocking.
  • Ruleset change is live on the repo already; merging this PR lands the docs + workflow branch-trigger alignment.

Document complementary static + ThrillhouseBot gates and make the existing
Dependency Review workflow a required merge check on dogfood PRs.

Co-authored-by: Cursor <cursoragent@cursor.com>
@github-actions

Copy link
Copy Markdown
Contributor

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

@thrillhousebot

Copy link
Copy Markdown

🤖 ThrillhouseBot PR Summary

What this PR does

Documents the dual-gate merge policy for static CI and ThrillhouseBot LLM review, and expands the dependency-review workflow to trigger on develop and release/** branches in addition to main.

Changes Overview

  • Files changed: 2
  • Lines added: +35
  • Lines removed: -2

Changed Files

File Change Summary
.github/workflows/dependency-review.yml Modified Expanded trigger branches to include develop and release/**, added comments linking to dual-gate policy.
CONTRIBUTING.md Modified Added dual-gate merge policy documentation, including gate table and triage guidance.

Risk Assessment

Risk Count
🔴 Critical 0
🟠 High 0
🟡 Medium 0
🔵 Low 0

No new issues found in this PR, but the review cannot be approved until required CI is confirmed green.

⚠️ Required CI Checks Status

Some required checks are still pending or have failed:

Check Type Status Detail
frontend check-run ⏳ Pending -
test check-run ⏳ Pending -
format check-run ⏳ Pending -
dependency-review check-run ⏳ Pending -
trivy missing ⏳ Pending -

Automated review by ThrillhouseBot. Reply with /review to re-run.

@codecov

codecov Bot commented Jul 15, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

Point holds at allow-ghsas / dependency-review-config.yml for that action;
keep osv-scanner.toml and .trivyignore for Scorecard/OSV and Trivy.

Co-authored-by: Cursor <cursoragent@cursor.com>

@thrillhousebot thrillhousebot Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ThrillhouseBot found no issues in this PR, but some checks are still pending or failed:

  • Check format is pending
  • Check test is pending
  • Check frontend is pending
  • Check trivy is pending
  • Check dependency-review is pending

@sonarqubecloud

Copy link
Copy Markdown

@devops-thiago
devops-thiago changed the base branch from main to release/v0.5.0 July 17, 2026 16:19
@devops-thiago
devops-thiago merged commit 5aaadcd into release/v0.5.0 Jul 17, 2026
19 checks passed
@devops-thiago
devops-thiago deleted the ci/issue-342-dual-gate-merge-policy branch July 17, 2026 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ci: add complementary dependency/static analysis gate alongside ThrillhouseBot review

1 participant