diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ebc8cf2..e5a5ff6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -249,52 +249,50 @@ All repositories must have the following branch protection rules enabled on the - Prevent direct commits to `main` - All changes must go through PR process -2. **Required Reviewers** - - Minimum 1 approval required - - @perplexity (QA) must review all changes - - @Timmy must review hermes-agent changes +# Contribution & Code Review Policy -3. **CI/CD Requirement** - - Require CI to pass before merge - - Block force pushes to main - - Prevent branch deletion +## Branch Protection Rules +All repositories enforce: +- ✅ Require Pull Request for merge +- ✅ Minimum 1 approval required +- ✅ Dismiss stale approvals on new commits +- ⚠️ Require CI to pass (CI runner pending for the-nexus) +- ✅ Block force push to `main` +- ✅ Block deletion of `main` branch -## Review Workflow +## Review Requirement +- 🧑‍ Default reviewer: `@perplexity` (QA gate) +- 🧑 Required reviewer: `@Timmy` for `hermes-agent/` only -### For All Contributors -- Create feature branches from `main` -- Open PR with clear description -- @perplexity will be automatically assigned as reviewer -- For hermes-agent: @Timmy must review critical changes +## Workflow +1. Create feature branch from `main` +2. Submit PR with clear description +3. Wait for @perplexity review +4. Address feedback if any +5. Merge after approval and passing CI -### For Maintainers -- Review all PRs within 24h -- Require at least 1 approval before merge -- Dismiss stale approvals on new commits - -## ci/CD Requirements -- All PRs must pass ci before merge -- Failing ci blocks merge -- ci status displayed in PR header - -## Enforcement -- Direct pushes to main: ❌ Prohibited -- Unreviewed merges: ❌ Prohibited -- Failing ci merges: ❌ Prohibited +## CI/CD Requirements +- All main branch merge require: + - ✅ Linting + - ✅ Unit tests + - ⚠️ Integration tests (pending for the-nexus) + - ✅ Security scans ## Exceptions - Emergency hotfixes require: - - @Timmy approval - - Post-merge documentation - - Follow-up PR for full review + - ✅ @Timmy approval + - ✅ Post-merge documentation + - ✅ Follow-up PR for full review -## Policy Enforcement -This document is the source of truth for: -- Branch protection settings -- Reviewer assignments -- Merge requirements +## Abandoned PRs +- PRs inactive >7 days: 🧹 archived +- Unreviewed PRs >14 days: ❌ closed -See Gitea admin settings for each repo to verify protection rules are enabled. +## CI Status +- ✅ hermes-agent: CI active +- �️ the-nexus: CI runner dead (see #915) +- ✅ timmy-home: No CI +- �️ timmy-config: Limited CI >>>>>>> replace ```