resolve merge conflicts for PR #40
- 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
This commit is contained in:
57
scripts/check-pr-details.sh
Executable file
57
scripts/check-pr-details.sh
Executable file
@@ -0,0 +1,57 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "=== Open PRs Details ==="
|
||||
echo ""
|
||||
|
||||
echo "Checking PR #37 and PR #40 on gitea.bubuit.net..."
|
||||
|
||||
echo -e "\n=== PR #37 Details ==="
|
||||
curl -s "https://gitea.bubuit.net/api/v1/repos/oib/aitbc/pulls/37" | python3 -c "
|
||||
import json, sys
|
||||
try:
|
||||
data = json.load(sys.stdin)
|
||||
print(f\"Title: {data.get('title', 'N/A')}\")
|
||||
print(f\"State: {data.get('state', 'N/A')}\")
|
||||
print(f\"Author: {data.get('user', {}).get('login', 'N/A')}\")
|
||||
print(f\"Head Branch: {data.get('head', {}).get('ref', 'N/A')}\")
|
||||
print(f\"Base Branch: {data.get('base', {}).get('ref', 'N/A')}\")
|
||||
print(f\"URL: {data.get('html_url', 'N/A')}\")
|
||||
print(f\"Mergeable: {data.get('mergeable', 'N/A')}\")
|
||||
print(f\"Additions: {data.get('additions', 'N/A')}\")
|
||||
print(f\"Deletions: {data.get('deletions', 'N/A')}\")
|
||||
except:
|
||||
print('Could not parse PR details')
|
||||
"
|
||||
|
||||
echo -e "\n=== PR #40 Details ==="
|
||||
curl -s "https://gitea.bubuit.net/api/v1/repos/oib/aitbc/pulls/40" | python3 -c "
|
||||
import json, sys
|
||||
try:
|
||||
data = json.load(sys.stdin)
|
||||
print(f\"Title: {data.get('title', 'N/A')}\")
|
||||
print(f\"State: {data.get('state', 'N/A')}\")
|
||||
print(f\"Author: {data.get('user', {}).get('login', 'N/A')}\")
|
||||
print(f\"Head Branch: {data.get('head', {}).get('ref', 'N/A')}\")
|
||||
print(f\"Base Branch: {data.get('base', {}).get('ref', 'N/A')}\")
|
||||
print(f\"URL: {data.get('html_url', 'N/A')}\")
|
||||
print(f\"Mergeable: {data.get('mergeable', 'N/A')}\")
|
||||
print(f\"Additions: {data.get('additions', 'N/A')}\")
|
||||
print(f\"Deletions: {data.get('deletions', 'N/A')}\")
|
||||
except:
|
||||
print('Could not parse PR details')
|
||||
"
|
||||
|
||||
echo -e "\n=== Review Instructions ==="
|
||||
echo "To review these PRs:"
|
||||
echo "1. Visit: https://gitea.bubuit.net/oib/aitbc/pulls"
|
||||
echo "2. Review PR #37: 'WIP: Remove faucet account from production genesis'"
|
||||
echo "3. Review PR #40: 'feat: add production setup and infrastructure improvements'"
|
||||
echo ""
|
||||
echo "Both PRs need approval from authorized users before merging."
|
||||
echo "Authorized users typically include:"
|
||||
echo "- Repository owner (oib)"
|
||||
echo "- Users with write/review permissions"
|
||||
echo ""
|
||||
echo "After review, you can:"
|
||||
echo "- Approve and merge via web interface"
|
||||
echo "- Or use CLI if you have merge permissions"
|
||||
Reference in New Issue
Block a user