- 新增 _get_gitea_config.py 从 YAML 读取 URL/repo/token
- _common.sh 改为通过 eval python 脚本加载配置
- GITEA_CICD_SETUP.md / DEV_AGENT.md / QE_AGENT.md 更新文档
- CI 工作流改用 ${{ gitea.server_url }} / ${{ gitea.repository }}
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
+9
-9
@@ -8,21 +8,21 @@ set -eu
|
||||
_COMMON_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_DIR="${PROJECT_DIR:-$(cd "$_COMMON_DIR/.." && pwd)}"
|
||||
|
||||
# ── Load local secrets (not tracked by git) ────────────────────────────────────
|
||||
if [ -f "$_COMMON_DIR/.env" ]; then
|
||||
source "$_COMMON_DIR/.env"
|
||||
# ── Load Gitea configuration ────────────────────────────────────────────────────
|
||||
# Primary: ~/.gitea/config.yaml (requires GITEA_USER)
|
||||
# Fallback: scripts/.env (backwards compat)
|
||||
if ! eval "$(python "$_COMMON_DIR/_get_gitea_config.py" 2>/dev/null)"; then
|
||||
# Fallback: source .env directly
|
||||
if [ -f "$_COMMON_DIR/.env" ]; then
|
||||
source "$_COMMON_DIR/.env"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Default environment variables ──────────────────────────────────────────────
|
||||
export GITEA_URL="${GITEA_URL:-https://git.zywl.me}"
|
||||
export GITEA_REPO="${GITEA_REPO:-zeekrAI/document_analyzer}"
|
||||
|
||||
# ── Validate required environment ──────────────────────────────────────────────
|
||||
require_token() {
|
||||
if [ -z "${GITEA_API_TOKEN:-}" ]; then
|
||||
echo "ERROR: GITEA_API_TOKEN is not set." >&2
|
||||
echo "Set it in scripts/.env or export it:" >&2
|
||||
echo " export GITEA_API_TOKEN=your-token" >&2
|
||||
echo "Set it in ~/.gitea/config.yaml (with GITEA_USER) or scripts/.env." >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Print Gitea config for current user as shell-exportable variables.
|
||||
|
||||
Usage (bash):
|
||||
eval "$(python scripts/_get_gitea_config.py)"
|
||||
|
||||
Usage (batch):
|
||||
for /f "usebackq tokens=1,* delims= " %%a in (
|
||||
`python scripts/_get_gitea_config.py --batch 2^>nul`
|
||||
) do set "%%b"
|
||||
|
||||
Config: ~/.gitea/config.yaml — multi-profile YAML.
|
||||
Env: GITEA_USER selects the profile (required).
|
||||
Fallback: scripts/.env (backwards compat, no GITEA_USER needed).
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
CONFIG_PATH = os.path.expanduser("~/.gitea/config.yaml")
|
||||
ENV_PATH = os.path.join(SCRIPT_DIR, ".env")
|
||||
|
||||
|
||||
def _read_yaml_config(path):
|
||||
import yaml
|
||||
with open(path) as f:
|
||||
return yaml.safe_load(f) or {}
|
||||
|
||||
|
||||
def main():
|
||||
use_batch = "--batch" in sys.argv
|
||||
prefix = "set" if use_batch else "export"
|
||||
|
||||
# 1) Primary: ~/.gitea/config.yaml
|
||||
if os.path.exists(CONFIG_PATH):
|
||||
user = os.environ.get("GITEA_USER")
|
||||
if not user:
|
||||
print(
|
||||
"Error: GITEA_USER is not set. "
|
||||
"Choose from: " + ", ".join(_read_yaml_config(CONFIG_PATH).keys()),
|
||||
file=sys.stderr,
|
||||
)
|
||||
sys.exit(1)
|
||||
|
||||
config = _read_yaml_config(CONFIG_PATH)
|
||||
profile = config.get(user)
|
||||
if not profile:
|
||||
print(f"Error: user '{user}' not found in {CONFIG_PATH}", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
print(f'{prefix} GITEA_URL={profile.get("url", "")}')
|
||||
print(f'{prefix} GITEA_REPO={profile.get("repo", "")}')
|
||||
print(f'{prefix} GITEA_API_TOKEN={profile.get("token", "")}')
|
||||
print(f'{prefix} GITEA_USER={user}')
|
||||
return
|
||||
|
||||
# 2) Fallback: scripts/.env
|
||||
if os.path.exists(ENV_PATH):
|
||||
print(f"Warning: {CONFIG_PATH} not found, falling back to {ENV_PATH}",
|
||||
file=sys.stderr)
|
||||
with open(ENV_PATH) as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line.startswith("export "):
|
||||
var = line[7:]
|
||||
if use_batch:
|
||||
var = var.replace("export ", "set ", 1)
|
||||
print(var)
|
||||
if use_batch:
|
||||
print(f"set GITEA_USER={os.environ.get('GITEA_USER', '')}")
|
||||
else:
|
||||
print(f"export GITEA_USER={os.environ.get('GITEA_USER', '')}")
|
||||
return
|
||||
|
||||
print(f"Error: {CONFIG_PATH} not found. Create it or set up scripts/.env.",
|
||||
file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+27
-11
@@ -21,19 +21,35 @@ import sys
|
||||
import urllib.request
|
||||
import urllib.error
|
||||
|
||||
GITEA_URL = os.environ.get("GITEA_URL", "https://git.zywl.me")
|
||||
GITEA_REPO = os.environ.get("GITEA_REPO", "zeekrAI/document_analyzer")
|
||||
GITEA_TOKEN = os.environ.get("GITEA_API_TOKEN", "")
|
||||
DEV_AGENT_ID = os.environ.get("DEV_AGENT_ID", "da-01")
|
||||
QE_AGENT_ID = os.environ.get("QE_AGENT_ID", "")
|
||||
def _load_gitea_config():
|
||||
"""Load Gitea URL, repo, and token from ~/.gitea/config.yaml or env vars."""
|
||||
config_path = os.path.expanduser("~/.gitea/config.yaml")
|
||||
if os.path.exists(config_path):
|
||||
import yaml # requires pyyaml
|
||||
with open(config_path) as f:
|
||||
config = yaml.safe_load(f) or {}
|
||||
user = os.environ.get("GITEA_USER")
|
||||
if not user:
|
||||
print("Error: GITEA_USER is not set (required for ~/.gitea/config.yaml).",
|
||||
file=sys.stderr)
|
||||
sys.exit(1)
|
||||
profile = config.get(user)
|
||||
if not profile:
|
||||
print(f"Error: user '{user}' not found in {config_path}", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
return (profile.get("url", ""), profile.get("repo", ""),
|
||||
profile.get("token", ""))
|
||||
# Fallback: plain env vars (for CI / backwards compat)
|
||||
return (os.environ.get("GITEA_URL", ""),
|
||||
os.environ.get("GITEA_REPO", ""),
|
||||
os.environ.get("GITEA_API_TOKEN", ""))
|
||||
|
||||
|
||||
GITEA_URL, GITEA_REPO, GITEA_TOKEN = _load_gitea_config()
|
||||
GITEA_USER = os.environ.get("GITEA_USER", "")
|
||||
|
||||
# Signature appended to all comments / PR bodies
|
||||
if QE_AGENT_ID:
|
||||
AGENT_ID = QE_AGENT_ID
|
||||
AGENT_SIG = f"\n\n---\n[qe-agent: {QE_AGENT_ID}]"
|
||||
else:
|
||||
AGENT_ID = DEV_AGENT_ID
|
||||
AGENT_SIG = f"\n\n---\n[{DEV_AGENT_ID}]"
|
||||
AGENT_SIG = f"\n\n---\n[{GITEA_USER}]" if GITEA_USER else ""
|
||||
|
||||
BASE = f"{GITEA_URL}/api/v1/repos/{GITEA_REPO}"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"""Create a Gitea issue when CI fails. Called from ci.yml on failure."""
|
||||
"""Create a Gitea issue when CI fails. Called from CI workflows."""
|
||||
|
||||
import argparse
|
||||
import json
|
||||
@@ -6,9 +6,6 @@ import os
|
||||
import urllib.request
|
||||
import urllib.error
|
||||
|
||||
GITEA_URL = "https://git.zywl.me"
|
||||
REPO = "zeekrAI/document_analyzer"
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
@@ -16,14 +13,21 @@ def main():
|
||||
parser.add_argument("--branch", required=True)
|
||||
parser.add_argument("--run", required=True)
|
||||
parser.add_argument("--message", required=True)
|
||||
parser.add_argument("--gitea-url", default=os.environ.get("GITEA_URL", ""),
|
||||
help="Gitea instance URL (default: $GITEA_URL)")
|
||||
parser.add_argument("--repo", default=os.environ.get("GITEA_REPO", ""),
|
||||
help="Repo path e.g. org/repo (default: $GITEA_REPO)")
|
||||
parser.add_argument("--api-token", default=os.environ.get("GITEA_API_TOKEN", ""))
|
||||
parser.add_argument("--workflow", default="CI", help="Workflow name that triggered this (default: CI)")
|
||||
parser.add_argument("--workflow", default="CI", help="Workflow name (default: CI)")
|
||||
parser.add_argument("--labels", default="ci-failure",
|
||||
help="Comma-separated labels for the issue (default: ci-failure)")
|
||||
help="Comma-separated labels (default: ci-failure)")
|
||||
args = parser.parse_args()
|
||||
|
||||
if not args.gitea_url or not args.repo:
|
||||
parser.error("--gitea-url and --repo are required (or set GITEA_URL and GITEA_REPO)")
|
||||
|
||||
sha_short = args.sha[:7]
|
||||
run_url = f"{GITEA_URL}/{REPO}/actions/runs/{args.run}"
|
||||
run_url = f"{args.gitea_url}/{args.repo}/actions/runs/{args.run}"
|
||||
labels = [l.strip() for l in args.labels.split(",") if l.strip()]
|
||||
|
||||
title = f"[{args.workflow}] Failure: {args.message[:80]}"
|
||||
@@ -45,7 +49,7 @@ def main():
|
||||
"labels": labels,
|
||||
}).encode("utf-8")
|
||||
|
||||
url = f"{GITEA_URL}/api/v1/repos/{REPO}/issues"
|
||||
url = f"{args.gitea_url}/api/v1/repos/{args.repo}/issues"
|
||||
req = urllib.request.Request(url, data=payload, method="POST")
|
||||
req.add_header("Authorization", f"token {args.api_token}")
|
||||
req.add_header("Content-Type", "application/json")
|
||||
|
||||
+15
-13
@@ -2,23 +2,25 @@
|
||||
chcp 65001 >nul
|
||||
title Dev-Agent - Gitea Issue Worker
|
||||
|
||||
:: ── Parse GITEA_USER from command line ────────────────────────────────────────
|
||||
if "%1"=="" (
|
||||
echo Usage: start_dev_agent.bat ^<GITEA_USER^>
|
||||
echo Example: start_dev_agent.bat pzhang_dev_agent_01
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
set GITEA_USER=%1
|
||||
|
||||
:: ── Change to project root ────────────────────────────────────────────────────
|
||||
cd /d "%~dp0.."
|
||||
|
||||
:: ── Load .env (batch-compatible parser: "export KEY=VALUE" → set KEY=VALUE) ──
|
||||
if exist "scripts\.env" (
|
||||
for /f "usebackq tokens=2,3 delims== " %%a in ("scripts\.env") do set %%a=%%b
|
||||
)
|
||||
:: ── Load Gitea configuration from ~/.gitea/config.yaml ────────────────────────
|
||||
for /f "usebackq tokens=1,* delims= " %%a in (`python scripts\_get_gitea_config.py --batch 2^>nul`) do set "%%b"
|
||||
|
||||
:: ── Defaults ──────────────────────────────────────────────────────────────────
|
||||
if "%GITEA_URL%"=="" set GITEA_URL=https://git.zywl.me
|
||||
if "%GITEA_REPO%"=="" set GITEA_REPO=zeekrAI/document_analyzer
|
||||
if "%DEV_AGENT_ID%"=="" set DEV_AGENT_ID=da-01
|
||||
|
||||
:: ── Validate token ────────────────────────────────────────────────────────────
|
||||
if "%GITEA_API_TOKEN%"=="" (
|
||||
echo ERROR: GITEA_API_TOKEN is not set.
|
||||
echo Set it in scripts\.env or in your environment.
|
||||
:: ── Validate required vars ────────────────────────────────────────────────────
|
||||
if "%GITEA_URL%"=="" (
|
||||
echo ERROR: Gitea configuration not loaded.
|
||||
echo Make sure "%USERPROFILE%\.gitea\config.yaml" contains a profile for "%GITEA_USER%".
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
#!/usr/bin/env bash
|
||||
# Dev-Agent 启动脚本 — 单次任务 + 互动轮询 两种模式
|
||||
# 用法: bash scripts/start_dev_agent.sh
|
||||
# 前置: 在 scripts/.env 中设置 GITEA_API_TOKEN
|
||||
# 用法: bash scripts/start_dev_agent.sh <GITEA_USER>
|
||||
# 示例: bash scripts/start_dev_agent.sh pzhang_dev_agent_01
|
||||
|
||||
set -eu
|
||||
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Usage: $0 <GITEA_USER>"
|
||||
echo "Example: $0 pzhang_dev_agent_01"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export GITEA_USER="$1"
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
source "$SCRIPT_DIR/_common.sh"
|
||||
|
||||
# Agent 标识: da-MMDD-HHmm,可通过环境变量覆盖
|
||||
export DEV_AGENT_ID="${DEV_AGENT_ID:-da-$(date +%m%d-%H%M)}"
|
||||
|
||||
banner "Dev"
|
||||
require_token
|
||||
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
#!/usr/bin/env bash
|
||||
# QE-Agent 启动脚本 — 单次任务 + 互动轮询 两种模式
|
||||
# 用法: bash scripts/start_qe_agent.sh
|
||||
# 前置: 在 scripts/.env 中设置 GITEA_API_TOKEN
|
||||
# 用法: bash scripts/start_qe_agent.sh <GITEA_USER>
|
||||
# 示例: bash scripts/start_qe_agent.sh pzhang_qe_agent_01
|
||||
|
||||
set -eu
|
||||
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Usage: $0 <GITEA_USER>"
|
||||
echo "Example: $0 pzhang_qe_agent_01"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export GITEA_USER="$1"
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
source "$SCRIPT_DIR/_common.sh"
|
||||
|
||||
# Agent 标识: qa-MMDD-HHmm,可通过环境变量覆盖
|
||||
export QE_AGENT_ID="${QE_AGENT_ID:-qa-$(date +%m%d-%H%M)}"
|
||||
|
||||
banner "QE"
|
||||
require_token
|
||||
|
||||
|
||||
Reference in New Issue
Block a user