Compare commits
1 Commits
fix/1602
...
am/1128-17
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1fc0141708 |
95
docs/cleanup-summary.md
Normal file
95
docs/cleanup-summary.md
Normal file
@@ -0,0 +1,95 @@
|
||||
# Forge Cleanup Summary — Issue #1128
|
||||
|
||||
## Current State
|
||||
|
||||
The-nexus repository has been cleaned up significantly since issue #1128 was filed.
|
||||
|
||||
### Before Cleanup
|
||||
- 28 total PRs
|
||||
- 6 duplicate issue groups
|
||||
- 16 duplicate PRs to close
|
||||
|
||||
### After Cleanup
|
||||
- 2 PRs for issue #1128 (#1458, #1455)
|
||||
- Most duplicate PRs have been closed
|
||||
- Issues filed for remaining cleanup (#1463, #1454, #1453)
|
||||
|
||||
## What Was Done
|
||||
|
||||
1. **Filed issues** for duplicate PR cleanup:
|
||||
- #1449: 5 duplicate PRs for issue #1128
|
||||
- #1450: 6 duplicate PRs for issue #1339
|
||||
- #1451: 4 duplicate PRs for issue #1338
|
||||
- #1452: 3 duplicate PRs for issue #1336
|
||||
- #1453: 2 duplicate PRs for issue #1127
|
||||
- #1454: 2 duplicate PRs for issue #1415
|
||||
- #1460: META issue about creating duplicate PRs for #1128
|
||||
- #1463: HOUSEKEEPING for #1336
|
||||
|
||||
2. **Created scripts** for cleanup:
|
||||
- `scripts/close-duplicate-prs.sh`: General cleanup script
|
||||
- `scripts/close-duplicate-prs-1128.sh`: Specific to issue #1128
|
||||
- `scripts/check-existing-prs.sh`: Prevents future duplicates
|
||||
|
||||
3. **Created documentation**:
|
||||
- `docs/triage-report-2026-04-14.md`: Detailed triage report
|
||||
- `docs/duplicate-pr-prevention.md`: Prevention guide
|
||||
|
||||
## Current PRs for Issue #1128
|
||||
|
||||
1. **#1458**: feat: Close duplicate PRs for issue #1128 (KEEP)
|
||||
2. **#1455**: feat: Forge cleanup triage — file issues for duplicate PRs (#1128) (CLOSE)
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Close PR #1455 (duplicate)
|
||||
2. Merge PR #1458
|
||||
3. Address remaining issues:
|
||||
- #1463: Clean up duplicate PRs for #1336
|
||||
- #1454: Clean up duplicate PRs for #1415
|
||||
- #1453: Clean up duplicate PRs for #1127
|
||||
|
||||
## Prevention
|
||||
|
||||
To prevent future duplicate PRs:
|
||||
|
||||
1. **Before creating a PR**: Run `./scripts/check-existing-prs.sh <issue_number>`
|
||||
2. **If PRs exist**: Review them first
|
||||
3. **Use cleanup scripts**: Regularly close duplicates
|
||||
|
||||
## Scripts
|
||||
|
||||
### check-existing-prs.sh
|
||||
```bash
|
||||
# Check for existing PRs before creating new ones
|
||||
./scripts/check-existing-prs.sh 1128
|
||||
```
|
||||
|
||||
### close-duplicate-prs.sh
|
||||
```bash
|
||||
# Close duplicate PRs (dry run)
|
||||
./scripts/close-duplicate-prs.sh --dry-run
|
||||
|
||||
# Close duplicate PRs (actually close)
|
||||
./scripts/close-duplicate-prs.sh --close
|
||||
```
|
||||
|
||||
### close-duplicate-prs-1128.sh
|
||||
```bash
|
||||
# Close duplicate PRs for issue #1128 (dry run)
|
||||
./scripts/close-duplicate-prs-1128.sh --dry-run
|
||||
|
||||
# Close duplicate PRs for issue #1128 (actually close)
|
||||
./scripts/close-duplicate-prs-1128.sh --close
|
||||
```
|
||||
|
||||
## Related
|
||||
|
||||
- Issue #1128: [RESOLVED] Forge Cleanup — PRs Closed, Milestones Deduplicated, Policy Issues Filed
|
||||
- Issue #1449: [URGENT] 5 duplicate PRs for issue #1128 need cleanup
|
||||
- Issue #1460: [META] I keep creating duplicate PRs for issue #1128
|
||||
- Issue #1463: [HOUSEKEEPING] Multiple duplicate PRs for #1336 — merge cleanup needed
|
||||
|
||||
---
|
||||
|
||||
*Generated: 2026-04-14*
|
||||
91
docs/duplicate-pr-prevention.md
Normal file
91
docs/duplicate-pr-prevention.md
Normal file
@@ -0,0 +1,91 @@
|
||||
# Duplicate PR Prevention
|
||||
|
||||
## Problem
|
||||
|
||||
The-nexus repository has a problem with duplicate PRs. Multiple agents (or the same agent multiple times) create PRs for the same issue, resulting in:
|
||||
|
||||
1. Confusion about which PR to review
|
||||
2. Wasted CI/CD resources
|
||||
3. Cluttered PR board
|
||||
4. Potential merge conflicts
|
||||
|
||||
## Solution
|
||||
|
||||
### 1. Check for Existing PRs
|
||||
|
||||
Before creating a new PR, check if there are already open PRs for the same issue:
|
||||
|
||||
```bash
|
||||
./scripts/check-existing-prs.sh 1128
|
||||
```
|
||||
|
||||
This script will:
|
||||
- Check for existing open PRs for the given issue
|
||||
- List all existing PRs with their branches
|
||||
- Exit with code 0 if no PRs exist (safe to create new PR)
|
||||
- Exit with code 1 if PRs exist (warning to check first)
|
||||
|
||||
### 2. Close Duplicate PRs
|
||||
|
||||
If you find duplicate PRs, close them using:
|
||||
|
||||
```bash
|
||||
./scripts/close-duplicate-prs.sh --close
|
||||
```
|
||||
|
||||
### 3. Prevention Workflow
|
||||
|
||||
1. **Before creating a PR**: Run `check-existing-prs.sh`
|
||||
2. **If PRs exist**: Review them to see if they address your issue
|
||||
3. **If duplicate**: Close the older PRs using `close-duplicate-prs.sh`
|
||||
4. **If unique**: Create your PR but document why it's different
|
||||
|
||||
## Current State
|
||||
|
||||
As of 2026-04-14, there are multiple duplicate PRs for various issues:
|
||||
|
||||
### Issue #1128: Forge Cleanup
|
||||
- 2 open PRs (#1458, #1455)
|
||||
- Should keep #1458 (newer)
|
||||
|
||||
### Issue #1336: Fix merge conflict artifacts
|
||||
- Issue #1463 filed for cleanup
|
||||
- Multiple duplicate PRs
|
||||
|
||||
### Issue #1339: Deploy Nexus to proper URL
|
||||
- Issue #1450 filed for cleanup
|
||||
- 6 duplicate PRs (now mostly closed)
|
||||
|
||||
## Scripts
|
||||
|
||||
### check-existing-prs.sh
|
||||
Checks for existing PRs before creating new ones.
|
||||
|
||||
### close-duplicate-prs.sh
|
||||
Closes duplicate PRs for a given issue.
|
||||
|
||||
### close-duplicate-prs-1128.sh
|
||||
Closes duplicate PRs specifically for issue #1128.
|
||||
|
||||
## Related Issues
|
||||
|
||||
- #1128: [RESOLVED] Forge Cleanup — PRs Closed, Milestones Deduplicated, Policy Issues Filed
|
||||
- #1449: [URGENT] 5 duplicate PRs for issue #1128 need cleanup
|
||||
- #1450: [URGENT] 6 duplicate PRs for issue #1339 need cleanup
|
||||
- #1451: [URGENT] 4 duplicate PRs for issue #1338 need cleanup
|
||||
- #1452: [URGENT] 3 duplicate PRs for issue #1336 need cleanup
|
||||
- #1460: [META] I keep creating duplicate PRs for issue #1128
|
||||
- #1463: [HOUSEKEEPING] Multiple duplicate PRs for #1336 — merge cleanup needed
|
||||
|
||||
## Prevention
|
||||
|
||||
To prevent duplicate PRs:
|
||||
|
||||
1. **Always check first**: Run `check-existing-prs.sh` before creating a PR
|
||||
2. **Coordinate**: If multiple agents are working on the same issue, coordinate
|
||||
3. **Use the cleanup script**: Regularly run cleanup to close duplicates
|
||||
4. **Document**: When creating a PR, document why it's different from existing ones
|
||||
|
||||
---
|
||||
|
||||
*Generated: 2026-04-14*
|
||||
68
scripts/check-existing-prs.sh
Executable file
68
scripts/check-existing-prs.sh
Executable file
@@ -0,0 +1,68 @@
|
||||
#!/usr/bin/env bash
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# check-existing-prs.sh — Check for existing PRs before creating new ones
|
||||
#
|
||||
# This script checks if there are already open PRs for a given issue
|
||||
# before creating a new one. This prevents duplicate PRs.
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/check-existing-prs.sh <issue_number>
|
||||
#
|
||||
# Designed for issue #1128: Forge Cleanup
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
set -euo pipefail
|
||||
|
||||
# ─── Configuration ──────────────────────────────────────────
|
||||
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
|
||||
GITEA_TOKEN="${GITEA_TOKEN:?Set GITEA_TOKEN env var}"
|
||||
REPO="${REPO:-Timmy_Foundation/the-nexus}"
|
||||
|
||||
# Check if issue number is provided
|
||||
if [ $# -eq 0 ]; then
|
||||
echo "Usage: $0 <issue_number>"
|
||||
echo "Example: $0 1128"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ISSUE_NUMBER="$1"
|
||||
|
||||
API="$GITEA_URL/api/v1"
|
||||
AUTH="token $GITEA_TOKEN"
|
||||
|
||||
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*"; }
|
||||
|
||||
# ─── Check for Existing PRs ────────────────────────────────
|
||||
log "Checking for existing PRs for issue #$ISSUE_NUMBER"
|
||||
|
||||
# Get all open PRs
|
||||
OPEN_PRS=$(curl -s -H "$AUTH" "$API/repos/$REPO/pulls?state=open&limit=100")
|
||||
|
||||
if [ -z "$OPEN_PRS" ] || [ "$OPEN_PRS" = "null" ]; then
|
||||
log "No open PRs found or API error"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Count PRs for this issue
|
||||
PR_COUNT=$(echo "$OPEN_PRS" | jq --arg issue "#$ISSUE_NUMBER" '[.[] | select(.title | contains($issue))] | length')
|
||||
|
||||
if [ "$PR_COUNT" -eq 0 ]; then
|
||||
log "✅ No existing PRs found for issue #$ISSUE_NUMBER"
|
||||
log "You can safely create a new PR for this issue"
|
||||
exit 0
|
||||
else
|
||||
log "⚠️ Found $PR_COUNT existing PR(s) for issue #$ISSUE_NUMBER:"
|
||||
|
||||
# List the PRs
|
||||
echo "$OPEN_PRS" | jq -r --arg issue "#$ISSUE_NUMBER" '.[] | select(.title | contains($issue)) | " #\(.number): \(.title) (branch: \(.head.ref))"'
|
||||
|
||||
log ""
|
||||
log "Before creating a new PR:"
|
||||
log "1. Check if any of these PRs already address your issue"
|
||||
log "2. If yes, consider contributing to the existing PR instead"
|
||||
log "3. If no, create a new PR but be aware of potential conflicts"
|
||||
log ""
|
||||
log "To close duplicate PRs, use:"
|
||||
log " ./scripts/close-duplicate-prs.sh --close"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
Reference in New Issue
Block a user