1ac76e2329
- Remove merge conflict markers from blockchain RPC router - Resolve dev_heartbeat.py conflicts (keep security vulnerability checks) - Fix claim-task.py conflicts (unify TTL handling with timedelta) - Preserve all production setup improvements from both branches
56 lines
2.1 KiB
Bash
Executable File
56 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
echo "=== Open PRs Review Script ==="
|
|
echo ""
|
|
|
|
# Check both servers for unmerged branches with potential PRs
|
|
echo "Checking for branches that might have open PRs..."
|
|
|
|
echo -e "\n=== AITBC Server Branches (not merged to main) ==="
|
|
cd /opt/aitbc
|
|
git branch -r | grep origin/ | grep -v HEAD | grep -v main | while read branch; do
|
|
# Check if branch has commits not in main
|
|
if git log --oneline $branch --not main --max-count 1 >/dev/null 2>&1; then
|
|
echo "📋 $branch - Has unmerged commits"
|
|
git log --oneline $branch --not main --max-count 3
|
|
echo "---"
|
|
fi
|
|
done
|
|
|
|
echo -e "\n=== AITBC1 Server Branches (not merged to main) ==="
|
|
ssh aitbc1-cascade "cd /opt/aitbc && git branch -r | grep origin/ | grep -v HEAD | grep -v main | while read branch; do
|
|
if git log --oneline \$branch --not main --max-count 1 >/dev/null 2>&1; then
|
|
echo \"📋 \$branch - Has unmerged commits\"
|
|
git log --oneline \$branch --not main --max-count 3
|
|
echo \"---\"
|
|
fi
|
|
done"
|
|
|
|
echo -e "\n=== Potential Open PRs ==="
|
|
echo "Based on the branches above, these likely have open PRs:"
|
|
echo "1. aitbc/13-stability-rings - Memory consolidation and stability improvements"
|
|
echo "2. aitbc/rings-auto-review - Auto-review functionality"
|
|
echo "3. aitbc1/36-remove-faucet - Faucet removal for production"
|
|
echo "4. aitbc1/security-hardening - Security improvements"
|
|
|
|
echo -e "\n=== Review Instructions ==="
|
|
echo "To review and merge these PRs:"
|
|
echo ""
|
|
echo "1. Visit: https://gitea.bubuit.net/oib/aitbc/pulls"
|
|
echo "2. Log in as one of the authorized reviewers"
|
|
echo "3. Review each open PR for:"
|
|
echo " - Code quality and functionality"
|
|
echo " - Test coverage"
|
|
echo " - Security implications"
|
|
echo " - Documentation"
|
|
echo "4. Approve and merge if ready"
|
|
echo ""
|
|
echo "Alternative: Merge via CLI if you have permissions:"
|
|
echo "git checkout main"
|
|
echo "git pull origin main"
|
|
echo "git merge origin/aitbc/13-stability-rings"
|
|
echo "git push origin main"
|
|
|
|
echo -e "\n=== Git Users with Review Permissions ==="
|
|
echo "Check gitea.bubuit.net for users with review rights on oib/aitbc repository"
|